Re: [PATCH 4/4] mac80211: stop queues before carrier off

[Dan Williams <dcbw@redhat.com>]

On Tue, 2008-09-09 at 00:40 +0300, Tomas Winkler wrote:
> On Mon, Sep 8, 2008 at 6:33 PM, Johannes Berg <johannes@sipsolutions.net> wrote:
> > During testing of the disassociation fixes, Tomas noticed that it
> > was possible to run into a situation where you'd suddenly get a
> > few "wlan0: dropped frame to <AP> (unauthorized port)" messages
> > and I found this to be due to the AP's sta_info having been
> > removed but netif_carrier_off not having removed/stopped traffic
> > yet. To avoid that, stop the queue for the interface (and avoid
> > bringing them up when another vif scans when they weren't up.)
> >
> > Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
> 
> It worked as far as I tested... ACK then.
> I foolishly tried to switch APs with NM... With sadness I have to say that
> we are now where other operating systems were 5 years ago

need... cfg80211...  Anyway, was there some problem with NM here?

Dan

> Tomas
> 
> 
> > ---
> >  net/mac80211/mlme.c |   26 +++++++++++++++++---------
> >  1 file changed, 17 insertions(+), 9 deletions(-)
> >
> > --- everything.orig/net/mac80211/mlme.c 2008-09-08 16:39:59.000000000 +0200
> > +++ everything/net/mac80211/mlme.c      2008-09-08 16:40:03.000000000 +0200
> > @@ -429,6 +429,7 @@ static void ieee80211_set_associated(str
> >        sdata->bss_conf.assoc = 1;
> >        ieee80211_bss_info_change_notify(sdata, changed);
> >
> > +       netif_tx_start_all_queues(sdata->dev);
> >        netif_carrier_on(sdata->dev);
> >
> >        ieee80211_sta_send_apinfo(sdata, ifsta);
> > @@ -850,6 +851,7 @@ static void ieee80211_set_disassoc(struc
> >        ifsta->assoc_scan_tries = 0;
> >        ifsta->assoc_tries = 0;
> >
> > +       netif_tx_stop_all_queues(sdata->dev);
> >        netif_carrier_off(sdata->dev);
> >
> >        ieee80211_sta_tear_down_BA_sessions(sdata, sta->addr);
> > @@ -3269,6 +3271,7 @@ static void ieee80211_sta_reset_auth(str
> >        ifsta->direct_probe_tries = 0;
> >        ifsta->auth_tries = 0;
> >        ifsta->assoc_tries = 0;
> > +       netif_tx_stop_all_queues(sdata->dev);
> >        netif_carrier_off(sdata->dev);
> >  }
> >
> > @@ -3745,13 +3748,15 @@ void ieee80211_scan_completed(struct iee
> >        rcu_read_lock();
> >        list_for_each_entry_rcu(sdata, &local->interfaces, list) {
> >                /* Tell AP we're back */
> > -               if (sdata->vif.type == IEEE80211_IF_TYPE_STA &&
> > -                   sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED)
> > -                       ieee80211_send_nullfunc(local, sdata, 0);
> > +               if (sdata->vif.type == IEEE80211_IF_TYPE_STA) {
> > +                       if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) {
> > +                               ieee80211_send_nullfunc(local, sdata, 0);
> > +                               netif_tx_wake_all_queues(sdata->dev);
> > +                       }
> > +               } else
> > +                       netif_tx_wake_all_queues(sdata->dev);
> >
> >                ieee80211_restart_sta_timer(sdata);
> > -
> > -               netif_wake_queue(sdata->dev);
> >        }
> >        rcu_read_unlock();
> >
> > @@ -3909,10 +3914,13 @@ static int ieee80211_sta_start_scan(stru
> >
> >        rcu_read_lock();
> >        list_for_each_entry_rcu(sdata, &local->interfaces, list) {
> > -               netif_stop_queue(sdata->dev);
> > -               if (sdata->vif.type == IEEE80211_IF_TYPE_STA &&
> > -                   (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED))
> > -                       ieee80211_send_nullfunc(local, sdata, 1);
> > +               if (sdata->vif.type == IEEE80211_IF_TYPE_STA) {
> > +                       if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) {
> > +                               netif_tx_stop_all_queues(sdata->dev);
> > +                               ieee80211_send_nullfunc(local, sdata, 1);
> > +                       }
> > +               } else
> > +                       netif_tx_stop_all_queues(sdata->dev);
> >        }
> >        rcu_read_unlock();
> >
> >
> > --
> >
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html