zd1211rw: Fix data padding for QoS

PATCH New Michael Buesch 1 participant 1 message Jun 5, 2008 Networking drivers (wireless)

Share & tools

Michael Buesch

author

2008-06-05 14:56 UTC #0 lore raw

PATCH 1/1 zd1211rw: Fix data padding for QoS

This patch fixes a data alignment issue in the zd1211rw driver. The IEEE80211_STYPE_QOS_DATA bit should be used as a bitwise test to test for the presence of the 2 byte QoS control field.

Signed-off-by Michael Buesch <[email protected]>

---

John, this is a bugfix for 2.6.26

drivers/net/wireless/zd1211rw/zd_mac.c +1 -1

Index: wireless-testing/drivers/net/wireless/zd1211rw/zd_mac.c
===================================================================
@@ -719,7 +719,7 @@ int zd_mac_rx(struct ieee80211_hw *hw, c
 	fc = le16_to_cpu(*((__le16 *) buffer));
 
 	is_qos = ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) &&
-		 ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_QOS_DATA);
+		 (fc & 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;

Signature · 1 line

Greetings Michael.