diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-11-04 16:18:12 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-11-04 16:18:12 -0500 |
| commit | bf515fb11ab539c76d04f0e3c5216ed41f41d81f (patch) | |
| tree | 6aaa226c2a40f90a649561b4a5bb0d1772b20bf1 /drivers/staging | |
| parent | 6bc6c49f1e2f3ab1bec05d1c08aad219ab4eb5d0 (diff) | |
| parent | cf2c92d840c1424bcb3bb501147c79c9b067ad77 (diff) | |
Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg <johannes@sipsolutions.net> says:
"This relatively large batch of changes is comprised of the
following:
* large mac80211-hwsim changes from Ben, Jukka and a bit myself
* OCB/WAVE/11p support from Rostislav on behalf of the Czech Technical
University in Prague and Volkswagen Group Research
* minstrel VHT work from Karl
* more CSA work from Luca
* WMM admission control support in mac80211 (myself)
* various smaller fixes, spelling corrections, and minor API additions"
Conflicts:
drivers/net/wireless/ath/wil6210/cfg80211.c
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c index bd6953af0a03..3d26955da724 100644 --- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c @@ -2856,8 +2856,10 @@ static int cfg80211_rtw_add_station(struct wiphy *wiphy, } static int cfg80211_rtw_del_station(struct wiphy *wiphy, - struct net_device *ndev, const u8 *mac) + struct net_device *ndev, + struct station_del_parameters *params) { + const u8 *mac = params->mac; int ret = 0; struct list_head *phead, *plist, *ptmp; u8 updated = 0; |