[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>

1 files changed, 2 insertions, 13 deletions

diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c
index 79ef959a2c11..ea4a19e1122c 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. */