rt2x00: Revert "rt2x00: Fix the beacon length bug"
This reverts:
b93ce437eb
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 <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
37ffc8da80
commit
79636a5fbb
|
@ -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.
|
||||
|
@ -1142,17 +1141,6 @@ static void rt2500usb_write_beacon(struct queue_entry *entry)
|
|||
memcpy(entry->skb->data, skbdesc->desc, skbdesc->desc_len);
|
||||
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.
|
||||
|
|
|
@ -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.
|
||||
|
@ -1581,17 +1580,6 @@ static void rt73usb_write_beacon(struct queue_entry *entry)
|
|||
memcpy(entry->skb->data, skbdesc->desc, skbdesc->desc_len);
|
||||
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.
|
||||
|
|
Loading…
Reference in a new issue