diff options
| author | sam <sam@FreeBSD.org> | 2005-07-22 17:31:18 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-07-22 17:31:18 +0000 |
| commit | 0fe58ae3f007b53e2a202cd3a3bf5a35d0a44b99 (patch) | |
| tree | a0bb17dcef615b1d6094223085e1f2831dee342a | |
| parent | f661a632a685b7c22eb499e9c4f0c30248ad5e11 (diff) | |
| download | FreeBSD-src-0fe58ae3f007b53e2a202cd3a3bf5a35d0a44b99.zip FreeBSD-src-0fe58ae3f007b53e2a202cd3a3bf5a35d0a44b99.tar.gz | |
simplifiy ieee80211_send_nulldata api
MFC after: 3 days
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 2 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_node.c | 2 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 3 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_proto.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 4c433b3..5cef95d 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -2701,7 +2701,7 @@ ieee80211_recv_pspoll(struct ieee80211com *ic, IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, "[%s] recv ps-poll, but queue empty\n", ether_sprintf(wh->i_addr2)); - ieee80211_send_nulldata(ic, ni); + ieee80211_send_nulldata(ni); ic->ic_stats.is_ps_qempty++; /* XXX node stat */ if (ic->ic_set_tim != NULL) ic->ic_set_tim(ic, ni, 0); /* just in case */ diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 28e0ef5..835ec46 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1477,7 +1477,7 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, "[%s] discard frame, age %u\n", ether "[%s] probe station due to inactivity\n", ether_sprintf(ni->ni_macaddr)); IEEE80211_NODE_UNLOCK(nt); - ieee80211_send_nulldata(ic, ni); + ieee80211_send_nulldata(ni); /* XXX stat? */ goto restart; } diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 657a10a..f45aa0f 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -166,8 +166,9 @@ ieee80211_mgmt_output(struct ieee80211com *ic, struct ieee80211_node *ni, * Send a null data frame to the specified node. */ int -ieee80211_send_nulldata(struct ieee80211com *ic, struct ieee80211_node *ni) +ieee80211_send_nulldata(struct ieee80211_node *ni) { + struct ieee80211com *ic = ni->ni_ic; struct ifnet *ifp = ic->ic_ifp; struct mbuf *m; struct ieee80211_frame *wh; diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h index 4cdca5a..6e14824 100644 --- a/sys/net80211/ieee80211_proto.h +++ b/sys/net80211/ieee80211_proto.h @@ -63,7 +63,7 @@ int ieee80211_setup_rates(struct ieee80211_node *ni, const u_int8_t *rates, const u_int8_t *xrates, int flags); void ieee80211_recv_mgmt(struct ieee80211com *, struct mbuf *, struct ieee80211_node *, int, int, u_int32_t); -int ieee80211_send_nulldata(struct ieee80211com *, struct ieee80211_node *); +int ieee80211_send_nulldata(struct ieee80211_node *); int ieee80211_send_mgmt(struct ieee80211com *, struct ieee80211_node *, int, int); int ieee80211_classify(struct ieee80211com *, struct mbuf *, |
