Page MenuHomeFreeBSD
Files F109334952

D36409.diff
No OneTemporary
Actions

D36409.diff
View Options

diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h
--- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h
+++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h
@@ -171,7 +171,7 @@
#define IEEE80211_STYPE_AUTH IEEE80211_FC0_SUBTYPE_AUTH
#define IEEE80211_STYPE_DEAUTH IEEE80211_FC0_SUBTYPE_DEAUTH
#define IEEE80211_STYPE_ACTION IEEE80211_FC0_SUBTYPE_ACTION
-#define IEEE80211_STYPE_QOS_DATA IEEE80211_FC0_SUBTYPE_QOS
+#define IEEE80211_STYPE_QOS_DATA IEEE80211_FC0_SUBTYPE_QOS_DATA
#define IEEE80211_NUM_ACS 4 /* net8021::WME_NUM_AC */
@@ -669,7 +669,7 @@
{
__le16 v;
- fc &= htole16(IEEE80211_FC0_SUBTYPE_QOS | IEEE80211_FC0_TYPE_MASK |
+ fc &= htole16(IEEE80211_FC0_SUBTYPE_QOS_DATA | IEEE80211_FC0_TYPE_MASK |
IEEE80211_FC0_VERSION_MASK);
v = htole16(IEEE80211_FC0_QOSDATA);
@@ -711,9 +711,9 @@
if ((fc & htole16(IEEE80211_FC1_DIR_MASK << 8)) ==
htole16(IEEE80211_FC1_DIR_DSTODS << 8))
size += IEEE80211_ADDR_LEN;
- if ((fc & htole16(IEEE80211_FC0_SUBTYPE_QOS |
+ if ((fc & htole16(IEEE80211_FC0_SUBTYPE_QOS_DATA |
IEEE80211_FC0_TYPE_MASK)) ==
- htole16(IEEE80211_FC0_SUBTYPE_QOS |
+ htole16(IEEE80211_FC0_SUBTYPE_QOS_DATA |
IEEE80211_FC0_TYPE_DATA))
size += sizeof(uint16_t);
}
diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c
--- a/sys/dev/ral/rt2661.c
+++ b/sys/dev/ral/rt2661.c
@@ -1443,7 +1443,7 @@
}
rate &= IEEE80211_RATE_VAL;
- if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS)
+ if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS_DATA)
noack = !! ieee80211_wme_vap_ac_is_noack(vap, ac);
if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.h
@@ -158,10 +158,10 @@
#define IEEE80211_FC0_SUBTYPE_CFACK 0x50
#define IEEE80211_FC0_SUBTYPE_CFPOLL 0x60
#define IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK 0x70
-#define IEEE80211_FC0_SUBTYPE_QOS 0x80
-#define IEEE80211_FC0_SUBTYPE_QOS_CFACK 0x90
-#define IEEE80211_FC0_SUBTYPE_QOS_CFPOLL 0xa0
-#define IEEE80211_FC0_SUBTYPE_QOS_CFACKPOLL 0xb0
+#define IEEE80211_FC0_SUBTYPE_QOS_DATA 0x80
+#define IEEE80211_FC0_SUBTYPE_QOS_DATA_CFACK 0x90
+#define IEEE80211_FC0_SUBTYPE_QOS_DATA_CFPOLL 0xa0
+#define IEEE80211_FC0_SUBTYPE_QOS_DATA_CFACKPOLL 0xb0
#define IEEE80211_FC0_SUBTYPE_QOS_NULL 0xc0
#define IEEE80211_IS_MGMT(wh) \
@@ -175,7 +175,7 @@
== IEEE80211_FC0_TYPE_DATA))
#define IEEE80211_FC0_QOSDATA \
- (IEEE80211_FC0_TYPE_DATA|IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_VERSION_0)
+ (IEEE80211_FC0_TYPE_DATA|IEEE80211_FC0_SUBTYPE_QOS_DATA|IEEE80211_FC0_VERSION_0)
#define IEEE80211_IS_QOSDATA(wh) \
((wh)->i_fc[0] == IEEE80211_FC0_QOSDATA)
@@ -247,8 +247,8 @@
/* does frame have QoS sequence control data */
#define IEEE80211_QOS_HAS_SEQ(wh) \
(((wh)->i_fc[0] & \
- (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \
- (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS))
+ (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS_DATA)) == \
+ (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS_DATA))
/*
* WME/802.11e information element.
diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c
--- a/sys/net80211/ieee80211_adhoc.c
+++ b/sys/net80211/ieee80211_adhoc.c
@@ -341,7 +341,7 @@
wh = mtod(m, struct ieee80211_frame *);
type = IEEE80211_FC0_TYPE_DATA;
dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
- subtype = IEEE80211_FC0_SUBTYPE_QOS;
+ subtype = IEEE80211_FC0_SUBTYPE_QOS_DATA;
hdrspace = ieee80211_hdrspace(ic, wh); /* XXX optimize? */
goto resubmit_ampdu;
}
@@ -522,7 +522,7 @@
/*
* Save QoS bits for use below--before we strip the header.
*/
- if (subtype == IEEE80211_FC0_SUBTYPE_QOS)
+ if (subtype == IEEE80211_FC0_SUBTYPE_QOS_DATA)
qos = ieee80211_getqos(wh)[0];
else
qos = 0;
diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c
--- a/sys/net80211/ieee80211_crypto_tkip.c
+++ b/sys/net80211/ieee80211_crypto_tkip.c
@@ -862,7 +862,7 @@
break;
}
- if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS) {
+ if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS_DATA) {
const struct ieee80211_qosframe *qwh =
(const struct ieee80211_qosframe *) wh;
hdr[12] = qwh->i_qos[0] & IEEE80211_QOS_TID;
diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c
--- a/sys/net80211/ieee80211_hostap.c
+++ b/sys/net80211/ieee80211_hostap.c
@@ -507,7 +507,7 @@
wh = mtod(m, struct ieee80211_frame *);
type = IEEE80211_FC0_TYPE_DATA;
dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
- subtype = IEEE80211_FC0_SUBTYPE_QOS;
+ subtype = IEEE80211_FC0_SUBTYPE_QOS_DATA;
hdrspace = ieee80211_hdrspace(ic, wh); /* XXX optimize? */
goto resubmit_ampdu;
}
@@ -710,7 +710,7 @@
/*
* Save QoS bits for use below--before we strip the header.
*/
- if (subtype == IEEE80211_FC0_SUBTYPE_QOS)
+ if (subtype == IEEE80211_FC0_SUBTYPE_QOS_DATA)
qos = ieee80211_getqos(wh)[0];
else
qos = 0;
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -1816,7 +1816,7 @@
else
#endif
qos[1] = 0;
- wh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_QOS;
+ wh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_QOS_DATA;
/*
* If this is an A-MSDU then ensure we set the
diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c
--- a/sys/net80211/ieee80211_sta.c
+++ b/sys/net80211/ieee80211_sta.c
@@ -600,7 +600,7 @@
*/
type = IEEE80211_FC0_TYPE_DATA;
dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
- subtype = IEEE80211_FC0_SUBTYPE_QOS;
+ subtype = IEEE80211_FC0_SUBTYPE_QOS_DATA;
hdrspace = ieee80211_hdrspace(ic, wh); /* XXX optimize? */
goto resubmit_ampdu;
}
@@ -794,7 +794,7 @@
/*
* Save QoS bits for use below--before we strip the header.
*/
- if (subtype == IEEE80211_FC0_SUBTYPE_QOS)
+ if (subtype == IEEE80211_FC0_SUBTYPE_QOS_DATA)
qos = ieee80211_getqos(wh)[0];
else
qos = 0;
diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c
--- a/sys/net80211/ieee80211_wds.c
+++ b/sys/net80211/ieee80211_wds.c
@@ -442,7 +442,7 @@
wh = mtod(m, struct ieee80211_frame *);
type = IEEE80211_FC0_TYPE_DATA;
dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
- subtype = IEEE80211_FC0_SUBTYPE_QOS;
+ subtype = IEEE80211_FC0_SUBTYPE_QOS_DATA;
hdrspace = ieee80211_hdrspace(ic, wh); /* XXX optimize? */
goto resubmit_ampdu;
}
@@ -583,7 +583,7 @@
/*
* Save QoS bits for use below--before we strip the header.
*/
- if (subtype == IEEE80211_FC0_SUBTYPE_QOS)
+ if (subtype == IEEE80211_FC0_SUBTYPE_QOS_DATA)
qos = ieee80211_getqos(wh)[0];
else
qos = 0;

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 4, 5:39 PM (20 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16458144
Default Alt Text
D36409.diff (6 KB)

Event Timeline