Skip to contentSkip to conversation

rt2x00: Fix PKT_PROBE_RESP breakage

PATCH In review Michael Buesch 2 participants 3 messages Dec 15, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rt2x00: Fix PKT_PROBE_RESP breakage

Fix breakage from removal of PKT_PROBE_RESP.

drivers/net/wireless/d80211/rt2x00/rt2400pci.c +5 -2
Index: jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
===================================================================
@@ -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.
drivers/net/wireless/d80211/rt2x00/rt2500pci.c +5 -2
Index: jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
===================================================================
@@ -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.
drivers/net/wireless/d80211/rt2x00/rt2500usb.c +5 -2
Index: jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
===================================================================
@@ -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.
drivers/net/wireless/d80211/rt2x00/rt61pci.c +5 -2
Index: jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt61pci.c
===================================================================
@@ -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.
drivers/net/wireless/d80211/rt2x00/rt73usb.c +5 -2
Index: jbenc-dscape/drivers/net/wireless/d80211/rt2x00/rt73usb.c
===================================================================
@@ -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.
Signature · 1 line
Greetings Michael.
#1 lore raw

Hi,

Quoted 1 line · Michael Buesch

Fix breakage from removal of PKT_PROBE_RESP.

Jiri had already send a patch to the netdev list to cover this breakage. ([PATCH 1/2] rt2x00: fix breakage after pkt_type field was removed) And I personally favour the patch from Jiri.

Ivo

#2 lore raw
Quoted 8 lines · Ivo van Doorn

Hi,

Quoted 1 line · Michael Buesch

Fix breakage from removal of PKT_PROBE_RESP.

Jiri had already send a patch to the netdev list to cover this breakage. ([PATCH 1/2] rt2x00: fix breakage after pkt_type field was removed) And I personally favour the patch from Jiri.

Ah, well. I don't care. I had to fix this to get my other patch done. ;)

Signature · 1 line
Greetings Michael.