Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

kernel/802_11: Put a couple more ethstr[] under IEEE80211_DEBUG.

  • Loading branch information...
commit 7e780f70758febea34106f0c07ea911a37b297ed 1 parent 579191c
Sascha Wildner authored
View
8 sys/netproto/802_11/wlan/ieee80211_hwmp.c
@@ -686,7 +686,9 @@ hwmp_recv_preq(struct ieee80211vap *vap, struct ieee80211_node *ni,
struct ieee80211_hwmp_route *hrorig;
struct ieee80211_hwmp_state *hs = vap->iv_hwmp;
struct ieee80211_meshprep_ie prep;
+#ifdef IEEE80211_DEBUG
char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
if (ni == vap->iv_bss ||
ni->ni_mlstate != IEEE80211_NODE_MESH_ESTABLISHED)
@@ -950,7 +952,9 @@ hwmp_recv_prep(struct ieee80211vap *vap, struct ieee80211_node *ni,
struct ieee80211com *ic = vap->iv_ic;
struct ifnet *ifp = vap->iv_ifp;
struct mbuf *m, *next;
+#ifdef IEEE80211_DEBUG
char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
/*
* Acceptance criteria: if the corresponding PREQ was not generated
@@ -1156,7 +1160,9 @@ hwmp_recv_perr(struct ieee80211vap *vap, struct ieee80211_node *ni,
struct ieee80211_hwmp_route *hr;
struct ieee80211_meshperr_ie pperr;
int i, forward = 0;
+#ifdef IEEE80211_DEBUG
char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
/*
* Acceptance criteria: check if we received a PERR from a
@@ -1301,7 +1307,9 @@ hwmp_discover(struct ieee80211vap *vap,
struct ieee80211_meshpreq_ie preq;
struct ieee80211_node *ni;
int sendpreq = 0;
+#ifdef IEEE80211_DEBUG
char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
KASSERT(vap->iv_opmode == IEEE80211_M_MBSS,
("not a mesh vap, opmode %d", vap->iv_opmode));
View
14 sys/netproto/802_11/wlan/ieee80211_mesh.c
@@ -517,7 +517,9 @@ mesh_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
struct ieee80211_mesh_state *ms = vap->iv_mesh;
struct ieee80211com *ic = vap->iv_ic;
enum ieee80211_state ostate;
+#ifdef IEEE80211_DEBUG
char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
ostate = vap->iv_state;
IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
@@ -1015,7 +1017,9 @@ mesh_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf)
uint32_t seq;
uint8_t *addr;
ieee80211_seq rxseq;
+#ifdef IEEE80211_DEBUG
char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
KASSERT(ni != NULL, ("null node"));
ni->ni_inact = ni->ni_inact_reload;
@@ -1880,7 +1884,9 @@ mesh_send_action_meshpeering_open(struct ieee80211_node *ni,
const struct ieee80211_rateset *rs;
struct mbuf *m;
uint8_t *frm;
+#ifdef IEEE80211_DEBUG
char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
"send PEER OPEN action: localid 0x%x", args[0]);
@@ -1941,7 +1947,9 @@ mesh_send_action_meshpeering_confirm(struct ieee80211_node *ni,
const struct ieee80211_rateset *rs;
struct mbuf *m;
uint8_t *frm;
+#ifdef IEEE80211_DEBUG
char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
"send PEER CONFIRM action: localid 0x%x, peerid 0x%x",
@@ -2009,7 +2017,9 @@ mesh_send_action_meshpeering_close(struct ieee80211_node *ni,
uint16_t *args = args0;
struct mbuf *m;
uint8_t *frm;
+#ifdef IEEE80211_DEBUG
char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
"send PEER CLOSE action: localid 0x%x, peerid 0x%x reason %d",
@@ -2060,7 +2070,9 @@ mesh_send_action_meshlink_request(struct ieee80211_node *ni,
struct ieee80211com *ic = ni->ni_ic;
struct mbuf *m;
uint8_t *frm;
+#ifdef IEEE80211_DEBUG
char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
"%s", "send LINK METRIC REQUEST action");
@@ -2100,7 +2112,9 @@ mesh_send_action_meshlink_reply(struct ieee80211_node *ni,
uint32_t *metric = args0;
struct mbuf *m;
uint8_t *frm;
+#ifdef IEEE80211_DEBUG
char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
"send LINK METRIC REPLY action: metric 0x%x", *metric);
Please sign in to comment.
Something went wrong with that request. Please try again.