From a15bc274d2f90337e9c9fdfeee0f81b007b273ad Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 24 Jan 2008 13:35:10 -0800 Subject: [PATCH] --- yaml --- r: 75684 b: refs/heads/master c: dbcc2ec60fe15448e5dfe4153f7347ac82b4da73 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/rx.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index cabb1ccfd307..f039bb832d64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 901720afa30f182c17b088ce4f692249332111bd +refs/heads/master: dbcc2ec60fe15448e5dfe4153f7347ac82b4da73 diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c index a7263fc476bd..00f908d9275e 100644 --- a/trunk/net/mac80211/rx.c +++ b/trunk/net/mac80211/rx.c @@ -1443,7 +1443,6 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb, struct ieee80211_sub_if_data *prev = NULL; struct sk_buff *skb_new; u8 *bssid; - int hdrlen; /* * key references and virtual interfaces are protected using RCU @@ -1473,18 +1472,6 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb, rx.fc = le16_to_cpu(hdr->frame_control); type = rx.fc & IEEE80211_FCTL_FTYPE; - /* - * Drivers are required to align the payload data to a four-byte - * boundary, so the last two bits of the address where it starts - * may not be set. The header is required to be directly before - * the payload data, padding like atheros hardware adds which is - * inbetween the 802.11 header and the payload is not supported, - * the driver is required to move the 802.11 header further back - * in that case. - */ - hdrlen = ieee80211_get_hdrlen(rx.fc); - WARN_ON_ONCE(((unsigned long)(skb->data + hdrlen)) & 3); - if (type == IEEE80211_FTYPE_DATA || type == IEEE80211_FTYPE_MGMT) local->dot11ReceivedFragmentCount++;