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/b43 | |
| 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/b43')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index d97a95b1addb..73730e94e0ac 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
| @@ -3412,7 +3412,8 @@ static void b43_tx_work(struct work_struct *work) | |||
| 3412 | } | 3412 | } |
| 3413 | 3413 | ||
| 3414 | static void b43_op_tx(struct ieee80211_hw *hw, | 3414 | static void b43_op_tx(struct ieee80211_hw *hw, |
| 3415 | struct sk_buff *skb) | 3415 | struct ieee80211_tx_control *control, |
| 3416 | struct sk_buff *skb) | ||
| 3416 | { | 3417 | { |
| 3417 | struct b43_wl *wl = hw_to_b43_wl(hw); | 3418 | struct b43_wl *wl = hw_to_b43_wl(hw); |
| 3418 | 3419 | ||