diff options
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2500usb.c | 12 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 12 |
2 files changed, 0 insertions, 24 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index 0e008b606f70..1cfda456b0ea 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c | |||
@@ -1133,7 +1133,6 @@ static void rt2500usb_write_beacon(struct queue_entry *entry) | |||
1133 | int pipe = usb_sndbulkpipe(usb_dev, 1); | 1133 | int pipe = usb_sndbulkpipe(usb_dev, 1); |
1134 | int length; | 1134 | int length; |
1135 | u16 reg; | 1135 | u16 reg; |
1136 | u32 word, len; | ||
1137 | 1136 | ||
1138 | /* | 1137 | /* |
1139 | * Add the descriptor in front of the skb. | 1138 | * Add the descriptor in front of the skb. |
@@ -1143,17 +1142,6 @@ static void rt2500usb_write_beacon(struct queue_entry *entry) | |||
1143 | skbdesc->desc = entry->skb->data; | 1142 | skbdesc->desc = entry->skb->data; |
1144 | 1143 | ||
1145 | /* | 1144 | /* |
1146 | * Adjust the beacon databyte count. The current number is | ||
1147 | * calculated before this function gets called, but falsely | ||
1148 | * assumes that the descriptor was already present in the SKB. | ||
1149 | */ | ||
1150 | rt2x00_desc_read(skbdesc->desc, 0, &word); | ||
1151 | len = rt2x00_get_field32(word, TXD_W0_DATABYTE_COUNT); | ||
1152 | len += skbdesc->desc_len; | ||
1153 | rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, len); | ||
1154 | rt2x00_desc_write(skbdesc->desc, 0, word); | ||
1155 | |||
1156 | /* | ||
1157 | * Disable beaconing while we are reloading the beacon data, | 1145 | * Disable beaconing while we are reloading the beacon data, |
1158 | * otherwise we might be sending out invalid data. | 1146 | * otherwise we might be sending out invalid data. |
1159 | */ | 1147 | */ |
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index e698ae0efbce..d9ef34c6670c 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -1572,7 +1572,6 @@ static void rt73usb_write_beacon(struct queue_entry *entry) | |||
1572 | struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb); | 1572 | struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb); |
1573 | unsigned int beacon_base; | 1573 | unsigned int beacon_base; |
1574 | u32 reg; | 1574 | u32 reg; |
1575 | u32 word, len; | ||
1576 | 1575 | ||
1577 | /* | 1576 | /* |
1578 | * Add the descriptor in front of the skb. | 1577 | * Add the descriptor in front of the skb. |
@@ -1582,17 +1581,6 @@ static void rt73usb_write_beacon(struct queue_entry *entry) | |||
1582 | skbdesc->desc = entry->skb->data; | 1581 | skbdesc->desc = entry->skb->data; |
1583 | 1582 | ||
1584 | /* | 1583 | /* |
1585 | * Adjust the beacon databyte count. The current number is | ||
1586 | * calculated before this function gets called, but falsely | ||
1587 | * assumes that the descriptor was already present in the SKB. | ||
1588 | */ | ||
1589 | rt2x00_desc_read(skbdesc->desc, 0, &word); | ||
1590 | len = rt2x00_get_field32(word, TXD_W0_DATABYTE_COUNT); | ||
1591 | len += skbdesc->desc_len; | ||
1592 | rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, len); | ||
1593 | rt2x00_desc_write(skbdesc->desc, 0, word); | ||
1594 | |||
1595 | /* | ||
1596 | * Disable beaconing while we are reloading the beacon data, | 1584 | * Disable beaconing while we are reloading the beacon data, |
1597 | * otherwise we might be sending out invalid data. | 1585 | * otherwise we might be sending out invalid data. |
1598 | */ | 1586 | */ |