netdev - [PATCH] rt2x00: Fix PKT_PROBE

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <200612152039.20635.mb@bu3sch.de>
Date:	Fri, 15 Dec 2006 20:39:20 +0100
From:	Michael Buesch <mb@...sch.de>
To:	Jiri Benc <jbenc@...e.cz>
Cc:	"Linville, John" <linville@...driver.com>, netdev@...r.kernel.org,
	rt2400-devel@...ts.sourceforge.net
Subject: [PATCH] rt2x00: Fix PKT_PROBE_RESP breakage

Fix breakage from removal of PKT_PROBE_RESP.

Signed-off-by: Michael Buesch <mb@...sch.de>


Index: jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
===================================================================
--- jbenc-dscape.orig/drivers/net/wireless/d80211/rt2x00/rt2400pci.c	2006-12-15 19:43:04.000000000 +0100
+++ jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt2400pci.c	2006-12-15 19:43:14.000000000 +0100
@@ -1427,8 +1427,11 @@ static void rt2400pci_write_tx_desc(stru
 	 * Beacons and probe responses require the tsf timestamp
 	 * to be inserted into the frame.
 	 */
-	req_timestamp = !!(control->queue == IEEE80211_TX_QUEUE_BEACON ||
-		  	   control->pkt_type == PKT_PROBE_RESP);
+	if (control->queue == IEEE80211_TX_QUEUE_BEACON)
+		req_timestamp = 1;
+	if ((frame_control & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT &&
+	    (frame_control & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP)
+		req_timestamp = 1;
 
 	/*
 	 * Determine with what IFS priority this frame should be send.
Index: jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
===================================================================
--- jbenc-dscape.orig/drivers/net/wireless/d80211/rt2x00/rt2500pci.c	2006-12-15 19:43:04.000000000 +0100
+++ jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt2500pci.c	2006-12-15 19:43:14.000000000 +0100
@@ -1568,8 +1568,11 @@ static void rt2500pci_write_tx_desc(stru
 	 * Beacons and probe responses require the tsf timestamp
 	 * to be inserted into the frame.
 	 */
-	req_timestamp = !!(control->queue == IEEE80211_TX_QUEUE_BEACON ||
-		  	   control->pkt_type == PKT_PROBE_RESP);
+	if (control->queue == IEEE80211_TX_QUEUE_BEACON)
+		req_timestamp = 1;
+	if ((frame_control & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT &&
+	    (frame_control & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP)
+		req_timestamp = 1;
 
 	/*
 	 * Determine with what IFS priority this frame should be send.
Index: jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
===================================================================
--- jbenc-dscape.orig/drivers/net/wireless/d80211/rt2x00/rt2500usb.c	2006-12-15 19:43:04.000000000 +0100
+++ jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt2500usb.c	2006-12-15 19:43:14.000000000 +0100
@@ -1539,8 +1539,11 @@ static void rt2500usb_write_tx_desc(stru
 	 * Beacons and probe responses require the tsf timestamp
 	 * to be inserted into the frame.
 	 */
-	req_timestamp = !!(control->queue == IEEE80211_TX_QUEUE_BEACON ||
-		  	   control->pkt_type == PKT_PROBE_RESP);
+	if (control->queue == IEEE80211_TX_QUEUE_BEACON)
+		req_timestamp = 1;
+	if ((frame_control & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT &&
+	    (frame_control & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP)
+		req_timestamp = 1;
 
 	/*
 	 * Determine with what IFS priority this frame should be send.
Index: jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt61pci.c
===================================================================
--- jbenc-dscape.orig/drivers/net/wireless/d80211/rt2x00/rt61pci.c	2006-12-15 15:58:04.000000000 +0100
+++ jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt61pci.c	2006-12-15 19:44:13.000000000 +0100
@@ -2023,8 +2023,11 @@ static void rt61pci_write_tx_desc(struct
 	 * Beacons and probe responses require the tsf timestamp
 	 * to be inserted into the frame.
 	 */
-	req_timestamp = !!(control->queue == IEEE80211_TX_QUEUE_BEACON ||
-		  	   control->pkt_type == PKT_PROBE_RESP);
+	if (control->queue == IEEE80211_TX_QUEUE_BEACON)
+		req_timestamp = 1;
+	if ((frame_control & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT &&
+	    (frame_control & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP)
+		req_timestamp = 1;
 
 	/*
 	 * Determine with what IFS priority this frame should be send.
Index: jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt73usb.c
===================================================================
--- jbenc-dscape.orig/drivers/net/wireless/d80211/rt2x00/rt73usb.c	2006-12-15 15:58:04.000000000 +0100
+++ jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt73usb.c	2006-12-15 19:46:11.000000000 +0100
@@ -1802,8 +1802,11 @@ static void rt73usb_write_tx_desc(struct
 	 * Beacons and probe responses require the tsf timestamp
 	 * to be inserted into the frame.
 	 */
-	req_timestamp = !!(control->queue == IEEE80211_TX_QUEUE_BEACON ||
-		  	   control->pkt_type == PKT_PROBE_RESP);
+	if (control->queue == IEEE80211_TX_QUEUE_BEACON)
+		req_timestamp = 1;
+	if ((frame_control & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT &&
+	    (frame_control & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP)
+		req_timestamp = 1;
 
 	/*
 	 * Determine with what IFS priority this frame should be send.

-- 
Greetings Michael.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html