diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-08-24 12:25:30 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-24 12:25:30 -0400 |
| commit | f20b6213f193f455a62ef9299ceca11f5531dff8 (patch) | |
| tree | 737a14af45038252fc0e3863d62dde09432cd779 /drivers/net/wireless/at76c50x-usb.c | |
| parent | e6e94e392fddb8845bdd2e199f55ebf7d76cb58d (diff) | |
| parent | a4881cc45a3fab4488e16c4934e149cfa620f1a9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.c')
| -rw-r--r-- | drivers/net/wireless/at76c50x-usb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index 88b8d64c90f1..e361afed99ff 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c | |||
| @@ -1726,7 +1726,9 @@ static void at76_mac80211_tx_callback(struct urb *urb) | |||
| 1726 | ieee80211_wake_queues(priv->hw); | 1726 | ieee80211_wake_queues(priv->hw); |
| 1727 | } | 1727 | } |
| 1728 | 1728 | ||
| 1729 | static void at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 1729 | static void at76_mac80211_tx(struct ieee80211_hw *hw, |
| 1730 | struct ieee80211_tx_control *control, | ||
| 1731 | struct sk_buff *skb) | ||
| 1730 | { | 1732 | { |
| 1731 | struct at76_priv *priv = hw->priv; | 1733 | struct at76_priv *priv = hw->priv; |
| 1732 | struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer; | 1734 | struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer; |