linux-next: manual merge of the net-next tree with the wireless tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/mac80211/sta_info.c between commit 27a737ff7cb0 ("mac80211: always
synchronize_net() during station removal") from the wireless tree and
commit 8d1f7ecd2af5 ("mac80211: defer tailroom counter manipulation when
roaming") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc net/mac80211/sta_info.c
index 238a0cc,3644ad7..0000000
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@@ -794,19 -798,14 +799,21 @@@ int __must_check __sta_info_destroy(str
        list_del_rcu(&sta->list);
  
        mutex_lock(&local->key_mtx);
 -      for (i = 0; i < NUM_DEFAULT_KEYS; i++)
 +      for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
-               __ieee80211_key_free(key_mtx_dereference(local, sta->gtk[i]));
+               __ieee80211_key_free(key_mtx_dereference(local, sta->gtk[i]),
+                                    true);
 -      if (sta->ptk)
 +              have_key = true;
 +      }
 +      if (sta->ptk) {
-               __ieee80211_key_free(key_mtx_dereference(local, sta->ptk));
+               __ieee80211_key_free(key_mtx_dereference(local, sta->ptk),
+                                    true);
 +              have_key = true;
 +      }
        mutex_unlock(&local->key_mtx);
  
 +      if (!have_key)
 +              synchronize_net();
 +
        sta->dead = true;
  
        local->num_sta--;

pgpueaDnDE75T.pgp
Description: PGP signature