diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-08-21 22:00:21 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-21 22:00:21 +0200 |
| commit | 01e17dacd47101ad7d33152bbfbbd4394352d2e6 (patch) | |
| tree | d94706b87fcad04d08a46a9b3555396d21ab41ec /drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | |
| parent | p54: fix powerpc gcc warnings (diff) | |
| parent | mac80211: clean up ieee80211_subif_start_xmit (diff) | |
| download | linux-01e17dacd47101ad7d33152bbfbbd4394352d2e6.tar.xz linux-01e17dacd47101ad7d33152bbfbbd4394352d2e6.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/mac80211_hwsim.c
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ce/trx.h')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h index c4adb9777365..a7cdd514cb2e 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h @@ -713,6 +713,7 @@ struct rx_desc_92c { void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr, u8 *pdesc, struct ieee80211_tx_info *info, + struct ieee80211_sta *sta, struct sk_buff *skb, u8 hw_queue, struct rtl_tcb_desc *ptcb_desc); bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw, |