1 files changed, 21 insertions, 11 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index c70c677b3f73..f536ff1b5c47 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1057,6 +1057,21 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
         rt2x00_desc_write(txd, 0, word);
 }
 
+static int rt2500usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
+                                     int maxpacket, struct sk_buff *skb)
+{
+        int length;
+
+        /*
+         * The length _must_ be a multiple of 2,
+         * but it must _not_ be a multiple of the USB packet size.
+         */
+        length = roundup(skb->len, 2);
+        length += (2 * !(length % maxpacket));
+
+        return length;
+}
+
 /*
  * TX data initialization
  */
@@ -1653,6 +1668,8 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw,
             rt2x00lib_get_ring(rt2x00dev, IEEE80211_TX_QUEUE_BEACON);
         struct data_entry *beacon;
         struct data_entry *guardian;
+        int pipe = usb_sndbulkpipe(usb_dev, 1);
+        int max_packet = usb_maxpacket(usb_dev, pipe, 1);
         int length;
 
         /*
@@ -1679,16 +1696,9 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw,
                                                          ring->desc_size),
                                 skb->len - ring->desc_size, control);
 
-        /*
-         * Length passed to usb_fill_urb cannot be an odd number,
-         * so add 1 byte to make it even.
-         */
-        length = skb->len;
-        if (length % 2)
-                length++;
+        length = rt2500usb_get_tx_data_len(rt2x00dev, max_packet, skb);
 
-        usb_fill_bulk_urb(beacon->priv, usb_dev,
-                          usb_sndbulkpipe(usb_dev, 1),
+        usb_fill_bulk_urb(beacon->priv, usb_dev, pipe,
                           skb->data, length, rt2500usb_beacondone, beacon);
 
         beacon->skb = skb;
@@ -1699,8 +1709,7 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw,
          * the 'flags' field we are not using for beacons.
          */
         guardian->flags = 0;
-        usb_fill_bulk_urb(guardian->priv, usb_dev,
-                          usb_sndbulkpipe(usb_dev, 1),
+        usb_fill_bulk_urb(guardian->priv, usb_dev, pipe,
                           &guardian->flags, 1, rt2500usb_beacondone, guardian);
 
         /*
@@ -1741,6 +1750,7 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = {
         .link_tuner             = rt2500usb_link_tuner,
         .write_tx_desc          = rt2500usb_write_tx_desc,
         .write_tx_data          = rt2x00usb_write_tx_data,
+        .get_tx_data_len        = rt2500usb_get_tx_data_len,
         .kick_tx_queue          = rt2500usb_kick_tx_queue,
         .fill_rxdone            = rt2500usb_fill_rxdone,
         .config_mac_addr        = rt2500usb_config_mac_addr,