aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2500usb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500usb.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2500usb.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 4122c5ebe7c3..cca1504550dc 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1666,13 +1666,12 @@ static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev)
1666/* 1666/*
1667 * IEEE80211 stack callback functions. 1667 * IEEE80211 stack callback functions.
1668 */ 1668 */
1669static int rt2500usb_beacon_update(struct ieee80211_hw *hw, 1669static int rt2500usb_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
1670 struct sk_buff *skb,
1671 struct ieee80211_tx_control *control)
1672{ 1670{
1673 struct rt2x00_dev *rt2x00dev = hw->priv; 1671 struct rt2x00_dev *rt2x00dev = hw->priv;
1674 struct usb_device *usb_dev = rt2x00dev_usb_dev(rt2x00dev); 1672 struct usb_device *usb_dev = rt2x00dev_usb_dev(rt2x00dev);
1675 struct rt2x00_intf *intf = vif_to_intf(control->vif); 1673 struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
1674 struct rt2x00_intf *intf = vif_to_intf(tx_info->control.vif);
1676 struct queue_entry_priv_usb_bcn *bcn_priv; 1675 struct queue_entry_priv_usb_bcn *bcn_priv;
1677 struct skb_frame_desc *skbdesc; 1676 struct skb_frame_desc *skbdesc;
1678 struct txentry_desc txdesc; 1677 struct txentry_desc txdesc;
@@ -1691,7 +1690,7 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw,
1691 * for our information. 1690 * for our information.
1692 */ 1691 */
1693 intf->beacon->skb = skb; 1692 intf->beacon->skb = skb;
1694 rt2x00queue_create_tx_descriptor(intf->beacon, &txdesc, control); 1693 rt2x00queue_create_tx_descriptor(intf->beacon, &txdesc);
1695 1694
1696 /* 1695 /*
1697 * Add the descriptor in front of the skb. 1696 * Add the descriptor in front of the skb.