3 files changed, 11 insertions, 9 deletions

diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 7e65d7c31802..09f46abc730a 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@ -143,7 +143,8 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)
                         if (flags & RTL818X_RX_DESC_FLAG_CRC32_ERR)
                                 rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
 
-                        ieee80211_rx_irqsafe(dev, skb, &rx_status);
+                        memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));
+                        ieee80211_rx_irqsafe(dev, skb);
 
                         skb = new_skb;
                         priv->rx_buf[priv->rx_idx] = skb;
@@ -280,7 +281,7 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
                                 (ieee80211_get_tx_rate(dev, info)->bitrate * 2) / 10);
                 remainder = (16 * (skb->len + 4)) %
                             ((ieee80211_get_tx_rate(dev, info)->bitrate * 2) / 10);
-                if (remainder > 0 && remainder <= 6)
+                if (remainder <= 6)
                         plcp_len |= 1 << 15;
         }
 
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 294250e294dd..53f57dc52226 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -220,7 +220,7 @@ static void rtl8187_tx_cb(struct urb *urb)
                  * reading a register in the device. We are in interrupt mode
                  * here, thus queue the skb and finish on a work queue. */
                 skb_queue_tail(&priv->b_tx_status.queue, skb);
-                queue_delayed_work(hw->workqueue, &priv->work, 0);
+                ieee80211_queue_delayed_work(hw, &priv->work, 0);
         }
 }
 
@@ -380,7 +380,8 @@ static void rtl8187_rx_cb(struct urb *urb)
         rx_status.flag |= RX_FLAG_TSFT;
         if (flags & RTL818X_RX_DESC_FLAG_CRC32_ERR)
                 rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
-        ieee80211_rx_irqsafe(dev, skb, &rx_status);
+        memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));
+        ieee80211_rx_irqsafe(dev, skb);
 
         skb = dev_alloc_skb(RTL8187_MAX_RX);
         if (unlikely(!skb)) {
diff --git a/drivers/net/wireless/rtl818x/rtl8187_leds.c b/drivers/net/wireless/rtl818x/rtl8187_leds.c
index cf9f899fe0e6..a6cfb7e77994 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_leds.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_leds.c
@@ -108,11 +108,11 @@ static void rtl8187_led_brightness_set(struct led_classdev *led_dev,
         struct rtl8187_priv *priv = hw->priv;
 
         if (brightness == LED_OFF) {
-                queue_delayed_work(hw->workqueue, &priv->led_off, 0);
+                ieee80211_queue_delayed_work(hw, &priv->led_off, 0);
                 /* The LED is off for 1/20 sec so that it just blinks. */
-                queue_delayed_work(hw->workqueue, &priv->led_on, HZ / 20);
+                ieee80211_queue_delayed_work(hw, &priv->led_on, HZ / 20);
         } else
-                queue_delayed_work(hw->workqueue, &priv->led_on, 0);
+                ieee80211_queue_delayed_work(hw, &priv->led_on, 0);
 }
 
 static int rtl8187_register_led(struct ieee80211_hw *dev,
@@ -193,7 +193,7 @@ void rtl8187_leds_init(struct ieee80211_hw *dev, u16 custid)
         err = rtl8187_register_led(dev, &priv->led_rx, name,
                          ieee80211_get_rx_led_name(dev), ledpin);
         if (!err) {
-                queue_delayed_work(dev->workqueue, &priv->led_on, 0);
+                ieee80211_queue_delayed_work(dev, &priv->led_on, 0);
                 return;
         }
         /* registration of RX LED failed - unregister TX */
@@ -209,7 +209,7 @@ void rtl8187_leds_exit(struct ieee80211_hw *dev)
         struct rtl8187_priv *priv = dev->priv;
 
         /* turn the LED off before exiting */
-        queue_delayed_work(dev->workqueue, &priv->led_off, 0);
+        ieee80211_queue_delayed_work(dev, &priv->led_off, 0);
         cancel_delayed_work_sync(&priv->led_off);
         cancel_delayed_work_sync(&priv->led_on);
         rtl8187_unregister_led(&priv->led_rx);