rt2x00: Revert "rt2x00: Fix the beacon length bug"
PATCH 1/1 rt2x00: Revert "rt2x00: Fix the beacon length bug"
This reverts:
b93ce437eba7e0232683326f30d9d1167a872fad rt2x00: Fix the beacon length bug
The workaround is no longer required since it has been correctly fixed in rt2x00usb now.
Signed-off-by Ivo van Doorn <[email protected]>
--- drivers/net/wireless/rt2x00/rt2500usb.c | 12 ------------ drivers/net/wireless/rt2x00/rt73usb.c | 12 ------------ 2 files changed, 0 insertions(+), 24 deletions(-)
drivers/net/wireless/rt2x00/rt2500usb.c +0 -12
@@ -1133,7 +1133,6 @@ static void rt2500usb_write_beacon(struct queue_entry *entry)int pipe =usb_sndbulkpipe (usb_dev,1 );int length;u16 reg; -u32 word, len;/* * Add the descriptor in front of the skb.
@@ -1143,17 +1142,6 @@ static void rt2500usb_write_beacon(struct queue_entry *entry) skbdesc->desc = entry->skb->data;/* -* Adjust the beacon databyte count. The current number is -* calculated before this function gets called, but falsely -* assumes that the descriptor was already present in the SKB. -*/ -rt2x00_desc_read (skbdesc->desc,0 , &word); - len =rt2x00_get_field32 (word,TXD_W0_DATABYTE_COUNT ); - len += skbdesc->desc_len; -rt2x00_set_field32 (&word,TXD_W0_DATABYTE_COUNT , len); -rt2x00_desc_write (skbdesc->desc,0 , word); - -/* * Disable beaconing while we are reloading the beacon data, * otherwise we might be sending out invalid data. */
drivers/net/wireless/rt2x00/rt73usb.c +0 -12
@@ -1572,7 +1572,6 @@ static void rt73usb_write_beacon(struct queue_entry *entry)struct skb_frame_desc *skbdesc =get_skb_frame_desc (entry->skb);unsigned int beacon_base;u32 reg; -u32 word, len;/* * Add the descriptor in front of the skb.
@@ -1582,17 +1581,6 @@ static void rt73usb_write_beacon(struct queue_entry *entry) skbdesc->desc = entry->skb->data;/* -* Adjust the beacon databyte count. The current number is -* calculated before this function gets called, but falsely -* assumes that the descriptor was already present in the SKB. -*/ -rt2x00_desc_read (skbdesc->desc,0 , &word); - len =rt2x00_get_field32 (word,TXD_W0_DATABYTE_COUNT ); - len += skbdesc->desc_len; -rt2x00_set_field32 (&word,TXD_W0_DATABYTE_COUNT , len); -rt2x00_desc_write (skbdesc->desc,0 , word); - -/* * Disable beaconing while we are reloading the beacon data, * otherwise we might be sending out invalid data. */
Signature · 1 line
1.5.6.1