lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zd1211rw: fix alignment for QOS and WDS frames

Browse Source 
This patch fixes RX packet alignment issues in the zd1211rw driver.
This is based on a patch by Johannes Berg.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michael Buesch
2007-12-29 17:24:23 +01:00
committed by David S. Miller
parent 01c20986cb
commit 9081728b5f
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/wireless/zd1211rw/zd_mac.c
View File

@@ -623,6 +623,8 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length)
const struct rx_status *status; const struct rx_status *status;
struct sk_buff *skb; struct sk_buff *skb;
int bad_frame = 0; int bad_frame = 0;
u16 fc;
bool is_qos, is_4addr, need_padding;
if (length < ZD_PLCP_HEADER_SIZE + 10 /* IEEE80211_1ADDR_LEN */ + if (length < ZD_PLCP_HEADER_SIZE + 10 /* IEEE80211_1ADDR_LEN */ +
FCS_LEN + sizeof(struct rx_status)) FCS_LEN + sizeof(struct rx_status))
@@ -674,9 +676,22 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length)
&& !mac->pass_ctrl) && !mac->pass_ctrl)
return 0; return 0;
skb = dev_alloc_skb(length); fc = le16_to_cpu(*((__le16 *) buffer));
is_qos = ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) &&
((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_QOS_DATA);
is_4addr = (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS);
need_padding = is_qos ^ is_4addr;
skb = dev_alloc_skb(length + (need_padding ? 2 : 0));
if (skb == NULL) if (skb == NULL)
return -ENOMEM; return -ENOMEM;
if (need_padding) {
/* Make sure the the payload data is 4 byte aligned. */
skb_reserve(skb, 2);
}
memcpy(skb_put(skb, length), buffer, length); memcpy(skb_put(skb, length), buffer, length);
ieee80211_rx_irqsafe(hw, skb, &stats); ieee80211_rx_irqsafe(hw, skb, &stats);