diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-19 21:05:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-19 21:05:24 -0400 |
| commit | c78a85a8430e35aecd53e190a2f6b999062b1037 (patch) | |
| tree | fbd69827579db437492fb77b5faa53814114bed3 /net/mac80211/mesh_plink.c | |
| parent | 133800d1f0288b9ddfc0d0aded10d9efa82d5b8c (diff) | |
| parent | de06dbfa7861c9019eedefc0c356ba86e5098f1b (diff) | |
| download | linux-stable-c78a85a8430e35aecd53e190a2f6b999062b1037.tar.gz linux-stable-c78a85a8430e35aecd53e190a2f6b999062b1037.tar.bz2 linux-stable-c78a85a8430e35aecd53e190a2f6b999062b1037.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to 'net/mac80211/mesh_plink.c')
| -rw-r--r-- | net/mac80211/mesh_plink.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index bd3d55eb21d4..a07e93c21c9e 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -976,6 +976,10 @@ mesh_plink_get_event(struct ieee80211_sub_if_data *sdata, mpl_dbg(sdata, "Mesh plink error: no more free plinks\n"); goto out; } + + /* new matching peer */ + event = OPN_ACPT; + goto out; } else { if (!test_sta_flag(sta, WLAN_STA_AUTH)) { mpl_dbg(sdata, "Mesh plink: Action frame from non-authed peer\n"); @@ -985,12 +989,6 @@ mesh_plink_get_event(struct ieee80211_sub_if_data *sdata, goto out; } - /* new matching peer */ - if (!sta) { - event = OPN_ACPT; - goto out; - } - switch (ftype) { case WLAN_SP_MESH_PEERING_OPEN: if (!matches_local) |