net: mac80211: Fix a typo.

[deliverable/linux.git] / net / mac80211 / iface.c

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 910729fc18cd2489e217b27f6153d55eb265bcbd..c1008a9d7bfb73a8b89c38e3b1ab196def6bb1df 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -187,6 +187,8 @@ static int ieee80211_open(struct net_device *dev)
                res = drv_start(local);
                if (res)
                        goto err_del_bss;
+               if (local->ops->napi_poll)
+                       napi_enable(&local->napi);
                /* we're brought up, everything changes */
                hw_reconf_flags = ~0;
                ieee80211_led_radio(local, true);
@@ -249,6 +251,8 @@ static int ieee80211_open(struct net_device *dev)
                        local->fif_other_bss++;
 
                ieee80211_configure_filter(local);
+
+               netif_carrier_on(dev);
                break;
        default:
                res = drv_add_interface(local, &sdata->vif);
@@ -517,6 +521,8 @@ static int ieee80211_stop(struct net_device *dev)
        ieee80211_recalc_ps(local, -1);
 
        if (local->open_count == 0) {
+               if (local->ops->napi_poll)
+                       napi_disable(&local->napi);
                ieee80211_clear_tx_pending(local);
                ieee80211_stop_device(local);
 
@@ -741,7 +747,7 @@ static void ieee80211_iface_work(struct work_struct *work)
                        int len = skb->len;
 
                        mutex_lock(&local->sta_mtx);
-                       sta = sta_info_get(sdata, mgmt->sa);
+                       sta = sta_info_get_bss(sdata, mgmt->sa);
                        if (sta) {
                                switch (mgmt->u.action.u.addba_req.action_code) {
                                case WLAN_ACTION_ADDBA_REQ:
@@ -782,7 +788,7 @@ static void ieee80211_iface_work(struct work_struct *work)
                         * right, so terminate the session.
                         */
                        mutex_lock(&local->sta_mtx);
-                       sta = sta_info_get(sdata, mgmt->sa);
+                       sta = sta_info_get_bss(sdata, mgmt->sa);
                        if (sta) {
                                u16 tid = *ieee80211_get_qos_ctl(hdr) &
                                                IEEE80211_QOS_CTL_TID_MASK;