diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-22 13:58:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-22 13:58:36 -0400 |
| commit | 40a10fd740a4d5a9f3da255cf8dae48c6723d1a6 (patch) | |
| tree | a65eb4adca8e37ed7335345e94e36918593f7f92 /drivers/net/wireless/ath/wil6210/main.c | |
| parent | 99abe65ff18b6bbac2e55524827b571c3eccfa86 (diff) | |
| parent | 67af9811539be83dbdc0739215d29af23c870405 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/ath/wil6210/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/wil6210/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c index 1b265fd19de2..670cc6de3b4c 100644 --- a/drivers/net/wireless/ath/wil6210/main.c +++ b/drivers/net/wireless/ath/wil6210/main.c | |||
| @@ -81,7 +81,7 @@ static void wil_disconnect_cid(struct wil6210_priv *wil, int cid) | |||
| 81 | memset(&sta->stats, 0, sizeof(sta->stats)); | 81 | memset(&sta->stats, 0, sizeof(sta->stats)); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | static void _wil6210_disconnect(struct wil6210_priv *wil, void *bssid) | 84 | static void _wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid) |
| 85 | { | 85 | { |
| 86 | int cid = -ENOENT; | 86 | int cid = -ENOENT; |
| 87 | struct net_device *ndev = wil_to_ndev(wil); | 87 | struct net_device *ndev = wil_to_ndev(wil); |
| @@ -252,7 +252,7 @@ int wil_priv_init(struct wil6210_priv *wil) | |||
| 252 | return 0; | 252 | return 0; |
| 253 | } | 253 | } |
| 254 | 254 | ||
| 255 | void wil6210_disconnect(struct wil6210_priv *wil, void *bssid) | 255 | void wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid) |
| 256 | { | 256 | { |
| 257 | del_timer_sync(&wil->connect_timer); | 257 | del_timer_sync(&wil->connect_timer); |
| 258 | _wil6210_disconnect(wil, bssid); | 258 | _wil6210_disconnect(wil, bssid); |