From f3f08e16a3a8a661dc6b603f7045bc0be18c28e5 Mon Sep 17 00:00:00 2001 From: Andriy Voskoboinyk Date: Sun, 10 Feb 2019 23:58:56 +0000 Subject: net80211(4): hide casts for 'i_seq' field offset calculation inside ieee80211_getqos() and reuse it in various places. Checked with RTL8188EE, HOSTAP mode + RTL8188CUS, STA mode. MFC after: 2 weeks --- sys/net80211/ieee80211_adhoc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sys/net80211/ieee80211_adhoc.c') diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c index 457db3153876..24f6ba448e7b 100644 --- a/sys/net80211/ieee80211_adhoc.c +++ b/sys/net80211/ieee80211_adhoc.c @@ -522,11 +522,9 @@ adhoc_input(struct ieee80211_node *ni, struct mbuf *m, /* * Save QoS bits for use below--before we strip the header. */ - if (subtype == IEEE80211_FC0_SUBTYPE_QOS) { - qos = (dir == IEEE80211_FC1_DIR_DSTODS) ? - ((struct ieee80211_qosframe_addr4 *)wh)->i_qos[0] : - ((struct ieee80211_qosframe *)wh)->i_qos[0]; - } else + if (subtype == IEEE80211_FC0_SUBTYPE_QOS) + qos = ieee80211_getqos(wh)[0]; + else qos = 0; /* -- cgit v1.2.3