diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-10-11 15:35:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-11 15:35:42 -0400 |
| commit | 094daf7db7c47861009899ce23f9177d761e20b0 (patch) | |
| tree | a107065393720b80664157a035b206576e834793 /drivers/net/wireless/rtlwifi/core.c | |
| parent | 3ed6f6958c0ac21958285d8648f14d34da4bbcb3 (diff) | |
| parent | 5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
Diffstat (limited to 'drivers/net/wireless/rtlwifi/core.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c index 21e40f62a8d7..3f0f056fae9c 100644 --- a/drivers/net/wireless/rtlwifi/core.c +++ b/drivers/net/wireless/rtlwifi/core.c | |||
| @@ -504,7 +504,8 @@ static int _rtl_get_hal_qnum(u16 queue) | |||
| 504 | *for mac80211 VO=0, VI=1, BE=2, BK=3 | 504 | *for mac80211 VO=0, VI=1, BE=2, BK=3 |
| 505 | *for rtl819x BE=0, BK=1, VI=2, VO=3 | 505 | *for rtl819x BE=0, BK=1, VI=2, VO=3 |
| 506 | */ | 506 | */ |
| 507 | static int rtl_op_conf_tx(struct ieee80211_hw *hw, u16 queue, | 507 | static int rtl_op_conf_tx(struct ieee80211_hw *hw, |
| 508 | struct ieee80211_vif *vif, u16 queue, | ||
| 508 | const struct ieee80211_tx_queue_params *param) | 509 | const struct ieee80211_tx_queue_params *param) |
| 509 | { | 510 | { |
| 510 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 511 | struct rtl_priv *rtlpriv = rtl_priv(hw); |