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

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

rtlwifi: Modify base.{c,h} for new drivers 



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

drivers/net/wireless/rtlwifi/base.c

+419 −227

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/rtlwifi/base.h

+27 −22
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ 
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA

 *

 * The full GNU General Public License is included in this distribution in the

 * file called LICENSE.

 *
@@ -55,6 +51,16 @@ enum ap_peer { 
#define MAX_BIT_RATE_40MHZ_MCS15	300	/* Mbps */

#define MAX_BIT_RATE_40MHZ_MCS7		150	/* Mbps */



#define MAX_BIT_RATE_SHORT_GI_2NSS_80MHZ_MCS9	867	/* Mbps */

#define MAX_BIT_RATE_SHORT_GI_2NSS_80MHZ_MCS7	650	/* Mbps */

#define MAX_BIT_RATE_LONG_GI_2NSS_80MHZ_MCS9	780	/* Mbps */

#define MAX_BIT_RATE_LONG_GI_2NSS_80MHZ_MCS7	585	/* Mbps */



#define MAX_BIT_RATE_SHORT_GI_1NSS_80MHZ_MCS9	434	/* Mbps */

#define MAX_BIT_RATE_SHORT_GI_1NSS_80MHZ_MCS7	325	/* Mbps */

#define MAX_BIT_RATE_LONG_GI_1NSS_80MHZ_MCS9	390	/* Mbps */

#define MAX_BIT_RATE_LONG_GI_1NSS_80MHZ_MCS7	293	/* Mbps */



#define RTL_RATE_COUNT_LEGACY		12

#define RTL_CHANNEL_COUNT		14
@@ -78,9 +84,9 @@ enum ap_peer { 
#define SET_80211_PS_POLL_AID(_hdr, _val)		\

	(*(u16 *)((u8 *)(_hdr) + 2) = _val)

#define SET_80211_PS_POLL_BSSID(_hdr, _val)		\

	memcpy(((u8 *)(_hdr)) + 4, (u8 *)(_val), ETH_ALEN)

	ether_addr_copy(((u8 *)(_hdr)) + 4, (u8 *)(_val))

#define SET_80211_PS_POLL_TA(_hdr, _val)		\

	memcpy(((u8 *)(_hdr)) + 10, (u8 *)(_val), ETH_ALEN)

	ether_addr_copy(((u8 *)(_hdr))+10, (u8 *)(_val))



#define SET_80211_HDR_DURATION(_hdr, _val)	\

	(*(u16 *)((u8 *)(_hdr) + FRAME_OFFSET_DURATION) = le16_to_cpu(_val))
@@ -113,23 +119,27 @@ void rtl_init_rx_config(struct ieee80211_hw *hw); 
void rtl_init_rfkill(struct ieee80211_hw *hw);

void rtl_deinit_rfkill(struct ieee80211_hw *hw);



void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb);

void rtl_watch_dog_timer_callback(unsigned long data);

void rtl_deinit_deferred_work(struct ieee80211_hw *hw);



bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);

int rtlwifi_rate_mapping(struct ieee80211_hw *hw,

			 bool isht, u8 desc_rate, bool first_ampdu);

bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb);

u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);



void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb);

void rtl_watch_dog_timer_callback(unsigned long data);

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,

		     u16 tid);

int rtl_rx_agg_stop(struct ieee80211_hw *hw, 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, u16 tid);

int rtl_rx_agg_stop(struct ieee80211_hw *hw,

		    struct ieee80211_sta *sta, u16 tid);

void rtl_watchdog_wq_callback(void *data);

void rtl_fwevt_wq_callback(void *data);
@@ -147,11 +157,6 @@ u8 rtl_tid_to_ac(u8 tid); 
extern struct attribute_group rtl_attribute_group;

void rtl_easy_concurrent_retrytimer_callback(unsigned long data);

extern struct rtl_global_var rtl_global_var;

int rtlwifi_rate_mapping(struct ieee80211_hw *hw,

			 bool isht, u8 desc_rate, bool first_ampdu);

bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb);

struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw,

				u8 *sa, u8 *bssid, u16 tid);

void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation);



#endif

drivers/net/wireless/rtlwifi/wifi.h

+17 −3
Original line number Diff line number Diff line
@@ -691,6 +691,13 @@ enum rtl_var_map { 
	RTL_RC_HT_RATEMCS7,

	RTL_RC_HT_RATEMCS15,



	RTL_RC_VHT_RATE_1SS_MCS7,

	RTL_RC_VHT_RATE_1SS_MCS8,

	RTL_RC_VHT_RATE_1SS_MCS9,

	RTL_RC_VHT_RATE_2SS_MCS7,

	RTL_RC_VHT_RATE_2SS_MCS8,

	RTL_RC_VHT_RATE_2SS_MCS9,



	/*keep it last */

	RTL_VAR_MAP_MAX,

};
@@ -1924,7 +1931,7 @@ struct rt_link_detect { 
};



struct rtl_tcb_desc {

	u8 packet_bw:1;

	u8 packet_bw:2;

	u8 multicast:1;

	u8 broadcast:1;
@@ -2118,9 +2125,13 @@ struct rtl_mod_params { 
	/* default: 1 = using linked fw power save */

	bool fwctrl_lps;



	/* default: 0 = not using MSI interrupts mode */

	/* submodules should set their own defalut value */

	/* default: 0 = not using MSI interrupts mode

	 * submodules should set their own default value

	 */

	bool msi_support;



	/* default 0: 1 means disable */

	bool disable_watchdog;

};



struct rtl_hal_usbint_cfg {
@@ -2503,6 +2514,9 @@ struct rtl_priv { 
	 */

	bool use_new_trx_flow;



#ifdef CONFIG_PM

	struct wiphy_wowlan_support wowlan;

#endif

	/*This must be the last item so

	   that it points to the data allocated

	   beyond  this structure like: