Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 2 deletions

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 21b1fdf5d01d..6a1603bcdced 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -148,14 +148,17 @@ u32 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata)
 void mesh_sta_cleanup(struct sta_info *sta)
 {
         struct ieee80211_sub_if_data *sdata = sta->sdata;
-        u32 changed;
+        u32 changed = 0;
 
         /*
          * maybe userspace handles peer allocation and peering, but in either
          * case the beacon is still generated by the kernel and we might need
          * an update.
          */
-        changed = mesh_accept_plinks_update(sdata);
+        if (sdata->u.mesh.user_mpm &&
+            sta->mesh->plink_state == NL80211_PLINK_ESTAB)
+                changed |= mesh_plink_dec_estab_count(sdata);
+        changed |= mesh_accept_plinks_update(sdata);
         if (!sdata->u.mesh.user_mpm) {
                 changed |= mesh_plink_deactivate(sta);
                 del_timer_sync(&sta->mesh->plink_timer);