aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index a7263fc476bd..00f908d9275e 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1443,7 +1443,6 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
1443 struct ieee80211_sub_if_data *prev = NULL; 1443 struct ieee80211_sub_if_data *prev = NULL;
1444 struct sk_buff *skb_new; 1444 struct sk_buff *skb_new;
1445 u8 *bssid; 1445 u8 *bssid;
1446 int hdrlen;
1447 1446
1448 /* 1447 /*
1449 * key references and virtual interfaces are protected using RCU 1448 * key references and virtual interfaces are protected using RCU
@@ -1473,18 +1472,6 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
1473 rx.fc = le16_to_cpu(hdr->frame_control); 1472 rx.fc = le16_to_cpu(hdr->frame_control);
1474 type = rx.fc & IEEE80211_FCTL_FTYPE; 1473 type = rx.fc & IEEE80211_FCTL_FTYPE;
1475 1474
1476 /*
1477 * Drivers are required to align the payload data to a four-byte
1478 * boundary, so the last two bits of the address where it starts
1479 * may not be set. The header is required to be directly before
1480 * the payload data, padding like atheros hardware adds which is
1481 * inbetween the 802.11 header and the payload is not supported,
1482 * the driver is required to move the 802.11 header further back
1483 * in that case.
1484 */
1485 hdrlen = ieee80211_get_hdrlen(rx.fc);
1486 WARN_ON_ONCE(((unsigned long)(skb->data + hdrlen)) & 3);
1487
1488 if (type == IEEE80211_FTYPE_DATA || type == IEEE80211_FTYPE_MGMT) 1475 if (type == IEEE80211_FTYPE_DATA || type == IEEE80211_FTYPE_MGMT)
1489 local->dot11ReceivedFragmentCount++; 1476 local->dot11ReceivedFragmentCount++;
1490 1477