mac80211: stringify mesh peering events
Convert mesh peering events into strings and make the debug output a little easier to read. Also stop printing the llid and plid since these don't change across peering states and are random numbers anyway so they just amount to noise. Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
52ac8c4887
commit
95e48addba
1 changed files with 24 additions and 14 deletions
|
@ -37,6 +37,28 @@ enum plink_event {
|
||||||
CLS_IGNR
|
CLS_IGNR
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const char * const mplstates[] = {
|
||||||
|
[NL80211_PLINK_LISTEN] = "LISTEN",
|
||||||
|
[NL80211_PLINK_OPN_SNT] = "OPN-SNT",
|
||||||
|
[NL80211_PLINK_OPN_RCVD] = "OPN-RCVD",
|
||||||
|
[NL80211_PLINK_CNF_RCVD] = "CNF_RCVD",
|
||||||
|
[NL80211_PLINK_ESTAB] = "ESTAB",
|
||||||
|
[NL80211_PLINK_HOLDING] = "HOLDING",
|
||||||
|
[NL80211_PLINK_BLOCKED] = "BLOCKED"
|
||||||
|
};
|
||||||
|
|
||||||
|
static const char * const mplevents[] = {
|
||||||
|
[PLINK_UNDEFINED] = "NONE",
|
||||||
|
[OPN_ACPT] = "OPN_ACPT",
|
||||||
|
[OPN_RJCT] = "OPN_RJCT",
|
||||||
|
[OPN_IGNR] = "OPN_IGNR",
|
||||||
|
[CNF_ACPT] = "CNF_ACPT",
|
||||||
|
[CNF_RJCT] = "CNF_RJCT",
|
||||||
|
[CNF_IGNR] = "CNF_IGNR",
|
||||||
|
[CLS_ACPT] = "CLS_ACPT",
|
||||||
|
[CLS_IGNR] = "CLS_IGNR"
|
||||||
|
};
|
||||||
|
|
||||||
static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
|
static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
|
||||||
enum ieee80211_self_protected_actioncode action,
|
enum ieee80211_self_protected_actioncode action,
|
||||||
u8 *da, __le16 llid, __le16 plid, __le16 reason);
|
u8 *da, __le16 llid, __le16 plid, __le16 reason);
|
||||||
|
@ -668,15 +690,6 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata,
|
||||||
u8 *baseaddr;
|
u8 *baseaddr;
|
||||||
u32 changed = 0;
|
u32 changed = 0;
|
||||||
__le16 plid, llid, reason;
|
__le16 plid, llid, reason;
|
||||||
static const char * const mplstates[] = {
|
|
||||||
[NL80211_PLINK_LISTEN] = "LISTEN",
|
|
||||||
[NL80211_PLINK_OPN_SNT] = "OPN-SNT",
|
|
||||||
[NL80211_PLINK_OPN_RCVD] = "OPN-RCVD",
|
|
||||||
[NL80211_PLINK_CNF_RCVD] = "CNF_RCVD",
|
|
||||||
[NL80211_PLINK_ESTAB] = "ESTAB",
|
|
||||||
[NL80211_PLINK_HOLDING] = "HOLDING",
|
|
||||||
[NL80211_PLINK_BLOCKED] = "BLOCKED"
|
|
||||||
};
|
|
||||||
|
|
||||||
/* need action_code, aux */
|
/* need action_code, aux */
|
||||||
if (len < IEEE80211_MIN_ACTION_SIZE + 3)
|
if (len < IEEE80211_MIN_ACTION_SIZE + 3)
|
||||||
|
@ -849,11 +862,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mpl_dbg(sdata,
|
mpl_dbg(sdata, "peer %pM in state %s got event %s\n", mgmt->sa,
|
||||||
"Mesh plink (peer, state, llid, plid, event): %pM %s %d %d %d\n",
|
mplstates[sta->plink_state], mplevents[event]);
|
||||||
mgmt->sa, mplstates[sta->plink_state],
|
|
||||||
le16_to_cpu(sta->llid), le16_to_cpu(sta->plid),
|
|
||||||
event);
|
|
||||||
reason = 0;
|
reason = 0;
|
||||||
spin_lock_bh(&sta->lock);
|
spin_lock_bh(&sta->lock);
|
||||||
switch (sta->plink_state) {
|
switch (sta->plink_state) {
|
||||||
|
|
Loading…
Reference in a new issue