diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2006-01-06 12:11:23 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-03-22 22:16:52 -0500 |
commit | 2dd50801b3ac95988bd5789e4ec576f3480ecc59 (patch) | |
tree | 462bcac55a35cc701f7e56000df433bdaba270ee /net/ieee80211/softmac/ieee80211softmac_assoc.c | |
parent | 5c4df6da580b9317dc0856e235232b95cbc8251c (diff) |
[PATCH] softmac: correctly use netif_carrier_{on,off}
TODO: add callbacks for ifup/ifdown (see mailing list)
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_assoc.c')
-rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_assoc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c index 98487448f2d3..085022fd23c0 100644 --- a/net/ieee80211/softmac/ieee80211softmac_assoc.c +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c | |||
@@ -268,7 +268,7 @@ ieee80211softmac_associated(struct ieee80211softmac_device *mac, | |||
268 | if (mac->set_bssid_filter) | 268 | if (mac->set_bssid_filter) |
269 | mac->set_bssid_filter(mac->dev, net->bssid); | 269 | mac->set_bssid_filter(mac->dev, net->bssid); |
270 | memcpy(mac->ieee->bssid, net->bssid, ETH_ALEN); | 270 | memcpy(mac->ieee->bssid, net->bssid, ETH_ALEN); |
271 | mac->dev->flags |= IFF_RUNNING; | 271 | netif_carrier_on(mac->dev); |
272 | 272 | ||
273 | mac->association_id = le16_to_cpup(&resp->aid); | 273 | mac->association_id = le16_to_cpup(&resp->aid); |
274 | } | 274 | } |
@@ -346,7 +346,7 @@ ieee80211softmac_handle_disassoc(struct net_device * dev, | |||
346 | struct ieee80211softmac_device *mac = ieee80211_priv(dev); | 346 | struct ieee80211softmac_device *mac = ieee80211_priv(dev); |
347 | unsigned long flags; | 347 | unsigned long flags; |
348 | dprintk(KERN_INFO PFX "got disassoc frame\n"); | 348 | dprintk(KERN_INFO PFX "got disassoc frame\n"); |
349 | 349 | netif_carrier_off(dev); | |
350 | spin_lock_irqsave(&mac->lock, flags); | 350 | spin_lock_irqsave(&mac->lock, flags); |
351 | mac->associnfo.bssvalid = 0; | 351 | mac->associnfo.bssvalid = 0; |
352 | mac->associated = 0; | 352 | mac->associated = 0; |