Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 266308
b: refs/heads/master
c: ba4a14e
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Pedersen authored and John W. Linville committed Sep 21, 2011
1 parent 58e34dd commit 3813aeb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6f2d93353a48af4d5b6ea2a79994d7c9a94b356a
refs/heads/master: ba4a14e1024fd783f0e56d96538a959a44651897
8 changes: 8 additions & 0 deletions trunk/net/mac80211/mesh_plink.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ enum plink_event {
CLS_IGNR
};

static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
enum ieee80211_self_protected_actioncode action,
u8 *da, __le16 llid, __le16 plid, __le16 reason);

static inline
void mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata)
{
Expand Down Expand Up @@ -133,6 +137,10 @@ void mesh_plink_deactivate(struct sta_info *sta)

spin_lock_bh(&sta->lock);
deactivated = __mesh_plink_deactivate(sta);
sta->reason = cpu_to_le16(WLAN_REASON_MESH_PEER_CANCELED);
mesh_plink_frame_tx(sdata, WLAN_SP_MESH_PEERING_CLOSE,
sta->sta.addr, sta->llid, sta->plid,
sta->reason);
spin_unlock_bh(&sta->lock);

if (deactivated)
Expand Down

0 comments on commit 3813aeb

Please sign in to comment.