diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2010-05-18 11:20:51 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-21 14:40:01 -0400 |
| commit | b6411fc23c70d7a9f57a0bfb35212ad92b5c2b5e (patch) | |
| tree | 5560d505cfd66c90d487ce8bd6353fd6acbe5f2c | |
| parent | ab1d864431a557580945387477bcbcb9dc7f7135 (diff) | |
| download | linux-3.10-b6411fc23c70d7a9f57a0bfb35212ad92b5c2b5e.tar.gz linux-3.10-b6411fc23c70d7a9f57a0bfb35212ad92b5c2b5e.tar.bz2 linux-3.10-b6411fc23c70d7a9f57a0bfb35212ad92b5c2b5e.zip | |
rndis_wlan: replace wireless_send_event with cfg80211_disconnected
Remove (hopefully) last use of WEXT in rndis_wlan. Replace wireless_send_event
with missing cfg80211_disconnected in rndis_wlan_do_link_down_work.
Reported-by: "Rogério Brito" <rbrito@ime.usp.br>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 2d2890878de..4bd61ee627c 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c @@ -2572,14 +2572,18 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev) static void rndis_wlan_do_link_down_work(struct usbnet *usbdev) { - union iwreq_data evt; + struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev); - netif_carrier_off(usbdev->net); + if (priv->connected) { + priv->connected = false; + memset(priv->bssid, 0, ETH_ALEN); + + deauthenticate(usbdev); - evt.data.flags = 0; - evt.data.length = 0; - memset(evt.ap_addr.sa_data, 0, ETH_ALEN); - wireless_send_event(usbdev->net, SIOCGIWAP, &evt, NULL); + cfg80211_disconnected(usbdev->net, 0, NULL, 0, GFP_KERNEL); + } + + netif_carrier_off(usbdev->net); } static void rndis_wlan_worker(struct work_struct *work) |