Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7953b2a authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: Modify core.c for new drivers 



Each of the routines in the rtlwifi common driver needs to be modified
for the coming changes. This patch prepares core.c, but also touches other
files.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 38506ece

drivers/net/wireless/rtlwifi/base.c

+4 −4
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ EXPORT_SYMBOL_GPL(rtl_is_special_data); 
 * functions called by core.c

 *

 *********************************************************/

int rtl_tx_agg_start(struct ieee80211_hw *hw,

int rtl_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		     struct ieee80211_sta *sta, u16 tid, u16 *ssn)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -1158,7 +1158,7 @@ int rtl_tx_agg_start(struct ieee80211_hw *hw, 
	return 0;

}



int rtl_tx_agg_stop(struct ieee80211_hw *hw,

int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		    struct ieee80211_sta *sta, u16 tid)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

drivers/net/wireless/rtlwifi/base.h

+4 −4
Original line number Diff line number Diff line
@@ -120,10 +120,10 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx); 
u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);



void rtl_watch_dog_timer_callback(unsigned long data);

int rtl_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_sta *sta,

		     u16 tid, u16 *ssn);

int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_sta *sta,

		    u16 tid);

int rtl_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		     struct ieee80211_sta *sta, u16 tid, u16 *ssn);

int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		    struct ieee80211_sta *sta, u16 tid);

int rtl_tx_agg_oper(struct ieee80211_hw *hw, struct ieee80211_sta *sta,

		    u16 tid);

int rtl_rx_agg_start(struct ieee80211_hw *hw, struct ieee80211_sta *sta,