* [PATCH] rt2x00: Fix PKT_PROBE_RESP breakage
@ 2006-12-15 19:39 Michael Buesch
2006-12-15 19:50 ` [Rt2400-devel] " Ivo van Doorn
0 siblings, 1 reply; 3+ messages in thread
From: Michael Buesch @ 2006-12-15 19:39 UTC (permalink / raw)
To: Jiri Benc; +Cc: Linville, John, netdev, rt2400-devel
Fix breakage from removal of PKT_PROBE_RESP.
Signed-off-by: Michael Buesch <mb@bu3sch.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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Rt2400-devel] [PATCH] rt2x00: Fix PKT_PROBE_RESP breakage
2006-12-15 19:39 [PATCH] rt2x00: Fix PKT_PROBE_RESP breakage Michael Buesch
@ 2006-12-15 19:50 ` Ivo van Doorn
2006-12-15 19:54 ` Michael Buesch
0 siblings, 1 reply; 3+ messages in thread
From: Ivo van Doorn @ 2006-12-15 19:50 UTC (permalink / raw)
To: rt2400-devel; +Cc: Michael Buesch, Jiri Benc, netdev, Linville, John
Hi,
On Friday 15 December 2006 20:39, Michael Buesch wrote:
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Rt2400-devel] [PATCH] rt2x00: Fix PKT_PROBE_RESP breakage
2006-12-15 19:50 ` [Rt2400-devel] " Ivo van Doorn
@ 2006-12-15 19:54 ` Michael Buesch
0 siblings, 0 replies; 3+ messages in thread
From: Michael Buesch @ 2006-12-15 19:54 UTC (permalink / raw)
To: Ivo van Doorn; +Cc: rt2400-devel, Jiri Benc, netdev, Linville, John
On Friday 15 December 2006 20:50, Ivo van Doorn wrote:
> Hi,
>
> On Friday 15 December 2006 20:39, Michael Buesch wrote:
> > 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. ;)
--
Greetings Michael.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-12-15 19:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-12-15 19:39 [PATCH] rt2x00: Fix PKT_PROBE_RESP breakage Michael Buesch
2006-12-15 19:50 ` [Rt2400-devel] " Ivo van Doorn
2006-12-15 19:54 ` Michael Buesch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).