diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2006-01-06 18:11:23 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-03-22 22:16:52 -0500 |
commit | 2dd50801b3ac95988bd5789e4ec576f3480ecc59 (patch) | |
tree | 462bcac55a35cc701f7e56000df433bdaba270ee /net/ieee80211/softmac/ieee80211softmac_module.c | |
parent | 5c4df6da580b9317dc0856e235232b95cbc8251c (diff) | |
download | op-kernel-dev-2dd50801b3ac95988bd5789e4ec576f3480ecc59.zip op-kernel-dev-2dd50801b3ac95988bd5789e4ec576f3480ecc59.tar.gz |
[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_module.c')
-rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_module.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c index 79ef959..ea4a19e 100644 --- a/net/ieee80211/softmac/ieee80211softmac_module.c +++ b/net/ieee80211/softmac/ieee80211softmac_module.c @@ -40,21 +40,10 @@ struct net_device *alloc_ieee80211softmac(int sizeof_priv) softmac->txrates.default_rate = IEEE80211_CCK_RATE_1MB; softmac->txrates.default_fallback = IEEE80211_CCK_RATE_1MB; - /* should we also assign softmac->mgmt_xmit here so - * that it is always valid? If so, we probably want - * to define a new function for that which just - * wraps ieee80211_tx_frame - */ + /* to start with, we can't send anything ... */ + netif_carrier_off(dev); - /* until associated, we're not ready */ - dev->flags &= ~IFF_RUNNING; - return dev; - -err_free_ieee80211: - free_ieee80211(dev); - - return NULL; } /* Clears the pending work queue items, stops all scans, etc. */ |