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/rtlwifi/rtl8192ce/trx.h | |
parent | e6e94e392fddb8845bdd2e199f55ebf7d76cb58d (diff) | |
parent | a4881cc45a3fab4488e16c4934e149cfa620f1a9 (diff) | |
download | lwn-f20b6213f193f455a62ef9299ceca11f5531dff8.tar.gz lwn-f20b6213f193f455a62ef9299ceca11f5531dff8.zip |
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/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, |