Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 171683
b: refs/heads/master
c: 1460dd1
h: refs/heads/master
i:
  171681: 9899fa2
  171679: 0f87e47
v: v3
  • Loading branch information
Rui Paulo authored and John W. Linville committed Nov 11, 2009
1 parent 4ec1282 commit d6f2ffb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f3c0d88a7fc1c3fff84ac57d3f3195d0dd1854ac
refs/heads/master: 1460dd158a520447b87661aea4afda1997d69cde
15 changes: 13 additions & 2 deletions trunk/net/mac80211/mesh_plink.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,17 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
u8 ie_len;
u8 *baseaddr;
__le16 plid, llid, reason;
#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
static const char *mplstates[] = {
[PLINK_LISTEN] = "LISTEN",
[PLINK_OPN_SNT] = "OPN-SNT",
[PLINK_OPN_RCVD] = "OPN-RCVD",
[PLINK_CNF_RCVD] = "CNF_RCVD",
[PLINK_ESTAB] = "ESTAB",
[PLINK_HOLDING] = "HOLDING",
[PLINK_BLOCKED] = "BLOCKED"
};
#endif

/* need action_code, aux */
if (len < IEEE80211_MIN_ACTION_SIZE + 3)
Expand Down Expand Up @@ -536,8 +547,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
}
}

mpl_dbg("Mesh plink (peer, state, llid, plid, event): %pM %d %d %d %d\n",
mgmt->sa, sta->plink_state,
mpl_dbg("Mesh plink (peer, state, llid, plid, event): %pM %s %d %d %d\n",
mgmt->sa, mplstates[sta->plink_state],
le16_to_cpu(sta->llid), le16_to_cpu(sta->plid),
event);
reason = 0;
Expand Down

0 comments on commit d6f2ffb

Please sign in to comment.