Attachment 598920 Details for Bug 797709 – Patch 3 of 6 to update driver to 12/30/2011 vendor version

[patch] Patch 3 of 6 to update driver to 12/30/2011 vendor version

0003-rtlwifi-Update-header-file.patch (text/plain), 6.97 KB, created by Larry Finger on 2012-07-18 15:20:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Larry Finger

Created: 2012-07-18 15:20:42 UTC

Size: 6.97 KB

patch

obsolete

>From 9df6d95318238076cedc0ba774599331be32366a Mon Sep 17 00:00:00 2001
>From: Larry Finger <Larry.Finger@lwfinger.net>
>Date: Tue, 17 Jul 2012 21:17:04 -0500
>Subject: [PATCH 3/6] rtlwifi: Update header file
>
>The latest version of the vendor driver for the rtlwifi family
>includes many changes. This patch incorporates the difference
>in the main header file.
>
>Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
>---
> drivers/net/wireless/rtlwifi/wifi.h |   93 ++++++++++++++++++++++++++++++++++-
> 1 file changed, 91 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
>index 378bafb..0112ab9 100644
>--- a/drivers/net/wireless/rtlwifi/wifi.h
>+++ b/drivers/net/wireless/rtlwifi/wifi.h
>@@ -135,7 +135,7 @@ enum hardware_type {
> 	HARDWARE_TYPE_RTL8192CU,
> 	HARDWARE_TYPE_RTL8192DE,
> 	HARDWARE_TYPE_RTL8192DU,
>-	HARDWARE_TYPE_RTL8723E,
>+	HARDWARE_TYPE_RTL8723AE,
> 	HARDWARE_TYPE_RTL8723U,
> 
> 	/* keep it last */
>@@ -400,6 +400,7 @@ enum rt_enc_alg {
> 	RSERVED_ENCRYPTION = 3,
> 	AESCCMP_ENCRYPTION = 4,
> 	WEP104_ENCRYPTION = 5,
>+	AESCMAC_ENCRYPTION = 6,	/*IEEE802.11w */
> };
> 
> enum rtl_hal_state {
>@@ -884,6 +885,7 @@ struct rtl_phy {
> 	u32 adda_backup[16];
> 	u32 iqk_mac_backup[IQK_MAC_REG_NUM];
> 	u32 iqk_bb_backup[10];
>+	bool iqk_initialized;
> 
> 	/* Dual mac */
> 	bool need_iqk;
>@@ -921,6 +923,8 @@ struct rtl_phy {
> #define RTL_AGG_OPERATIONAL			3
> #define RTL_AGG_OFF				0
> #define RTL_AGG_ON				1
>+#define RTL_RX_AGG_START			1
>+#define RTL_RX_AGG_STOP				0
> #define RTL_AGG_EMPTYING_HW_QUEUE_ADDBA		2
> #define RTL_AGG_EMPTYING_HW_QUEUE_DELBA		3
> 
>@@ -931,6 +935,7 @@ struct rtl_ht_agg {
> 	u64 bitmap;
> 	u32 rate_n_flags;
> 	u8 agg_state;
>+	u8 rx_agg_state;
> };
> 
> struct rtl_tid_data {
>@@ -938,11 +943,19 @@ struct rtl_tid_data {
> 	struct rtl_ht_agg agg;
> };
> 
>+struct rssi_sta {
>+	long undecorated_smoothed_pwdb;
>+};
>+
> struct rtl_sta_info {
>+	struct list_head list;
> 	u8 ratr_index;
> 	u8 wireless_mode;
> 	u8 mimo_ps;
> 	struct rtl_tid_data tids[MAX_TID_COUNT];
>+
>+	/* just used for ap adhoc or mesh*/
>+	struct rssi_sta rssi_stat;
> } __packed;
> 
> struct rtl_priv;
>@@ -1045,6 +1058,11 @@ struct rtl_mac {
> struct rtl_hal {
> 	struct ieee80211_hw *hw;
> 
>+	bool up_first_time;
>+	bool first_init;
>+	bool being_init_adapter;
>+	bool bbrf_ready;
>+
> 	enum intf_type interface;
> 	u16 hw_type;		/*92c or 92d or 92s and so on */
> 	u8 ic_class;
>@@ -1059,6 +1077,7 @@ struct rtl_hal {
> 	u16 fw_subversion;
> 	bool h2c_setinprogress;
> 	u8 last_hmeboxnum;
>+	bool fw_ready;
> 	/*Reserve page start offset except beacon in TxQ. */
> 	u8 fw_rsvdpage_startoffset;
> 	u8 h2c_txcmd_seq;
>@@ -1094,6 +1113,8 @@ struct rtl_hal {
> 	bool load_imrandiqk_setting_for2g;
> 
> 	bool disable_amsdu_8k;
>+	bool master_of_dmsp;
>+	bool slave_of_dmsp;
> };
> 
> struct rtl_security {
>@@ -1155,6 +1176,9 @@ struct rtl_dm {
> 	bool disable_tx_int;
> 	char ofdm_index[2];
> 	char cck_index;
>+
>+	/* DMSP */
>+	bool supp_phymode_switch;
> };
> 
> #define	EFUSE_MAX_LOGICAL_SIZE			256
>@@ -1348,6 +1372,10 @@ struct rtl_stats {
> };
> 
> struct rt_link_detect {
>+	/* count for roaming */
>+	u32 bcn_rx_inperiod;
>+	u32 roam_times;
>+
> 	u32 num_tx_in4period[4];
> 	u32 num_rx_in4period[4];
> 
>@@ -1355,6 +1383,8 @@ struct rt_link_detect {
> 	u32 num_rx_inperiod;
> 
> 	bool busytraffic;
>+	bool tx_busy_traffic;
>+	bool rx_busy_traffic;
> 	bool higher_busytraffic;
> 	bool higher_busyrxtraffic;
> 
>@@ -1465,7 +1495,12 @@ struct rtl_hal_ops {
> 			  u32 regaddr, u32 bitmask);
> 	void (*set_rfreg) (struct ieee80211_hw *hw, enum radio_path rfpath,
> 			   u32 regaddr, u32 bitmask, u32 data);
>+	void (*allow_all_destaddr)(struct ieee80211_hw *hw,
>+		bool allow_all_da, bool write_into_reg);
> 	void (*linked_set_reg) (struct ieee80211_hw *hw);
>+	void (*check_switch_to_dmdp) (struct ieee80211_hw *hw);
>+	void (*dualmac_easy_concurrent) (struct ieee80211_hw *hw);
>+	void (*dualmac_switch_to_dmdp) (struct ieee80211_hw *hw);
> 	bool (*phy_rf6052_config) (struct ieee80211_hw *hw);
> 	void (*phy_rf6052_set_cck_txpower) (struct ieee80211_hw *hw,
> 					    u8 *powerlevel);
>@@ -1485,6 +1520,8 @@ struct rtl_intf_ops {
> 	void (*read_efuse_byte)(struct ieee80211_hw *hw, u16 _offset, u8 *pbuf);
> 	int (*adapter_start) (struct ieee80211_hw *hw);
> 	void (*adapter_stop) (struct ieee80211_hw *hw);
>+	bool (*check_buddy_priv)(struct ieee80211_hw *hw,
>+				 struct rtl_priv **buddy_priv);
> 
> 	int (*adapter_tx) (struct ieee80211_hw *hw, struct sk_buff *skb,
> 			struct rtl_tcb_desc *ptcb_desc);
>@@ -1557,7 +1594,6 @@ struct rtl_hal_cfg {
> struct rtl_locks {
> 	/* mutex */
> 	struct mutex conf_mutex;
>-	struct mutex ps_mutex;
> 
> 	/*spin lock */
> 	spinlock_t ips_lock;
>@@ -1565,11 +1601,16 @@ struct rtl_locks {
> 	spinlock_t h2c_lock;
> 	spinlock_t rf_ps_lock;
> 	spinlock_t rf_lock;
>+	spinlock_t lps_lock;
> 	spinlock_t waitq_lock;
>+	spinlock_t entry_list_lock;
> 	spinlock_t usb_lock;
> 
> 	/*Dual mac*/
> 	spinlock_t cck_and_rw_pagea_lock;
>+
>+	/*Easy concurrent*/
>+	spinlock_t check_sendpkt_lock;
> };
> 
> struct rtl_works {
>@@ -1577,6 +1618,7 @@ struct rtl_works {
> 
> 	/*timer */
> 	struct timer_list watchdog_timer;
>+	struct timer_list dualmac_easyconcurrent_retrytimer;
> 
> 	/*task */
> 	struct tasklet_struct irq_tasklet;
>@@ -1604,6 +1646,31 @@ struct rtl_debug {
> 	char proc_name[20];
> };
> 
>+#define MIMO_PS_STATIC			0
>+#define MIMO_PS_DYNAMIC			1
>+#define MIMO_PS_NOLIMIT			3
>+
>+struct rtl_dualmac_easy_concurrent_ctl {
>+	enum band_type currentbandtype_backfordmdp;
>+	bool close_bbandrf_for_dmsp;
>+	bool change_to_dmdp;
>+	bool change_to_dmsp;
>+	bool switch_in_process;
>+};
>+
>+struct rtl_dmsp_ctl {
>+	bool activescan_for_slaveofdmsp;
>+	bool scan_for_anothermac_fordmsp;
>+	bool scan_for_itself_fordmsp;
>+	bool writedig_for_anothermacofdmsp;
>+	u32 curdigvalue_for_anothermacofdmsp;
>+	bool changecckpdstate_for_anothermacofdmsp;
>+	u8 curcckpdstate_for_anothermacofdmsp;
>+	bool changetxhighpowerlvl_for_anothermacofdmsp;
>+	u8 curtxhighlvl_for_anothermacofdmsp;
>+	long rssivalmin_for_anothermacofdmsp;
>+};
>+
> struct ps_t {
> 	u8 pre_ccastate;
> 	u8 cur_ccasate;
>@@ -1663,8 +1730,20 @@ struct dig_t {
> 	char backoffval_range_min;
> };
> 
>+struct rtl_global_var {
>+	/* from this list we can get
>+	 * other adapter's rtl_priv */
>+	struct list_head glb_priv_list;
>+	spinlock_t glb_list_lock;
>+};
>+
> struct rtl_priv {
> 	struct completion firmware_loading_complete;
>+	struct list_head list;
>+	struct rtl_priv *buddy_priv;
>+	struct rtl_global_var *glb_var;
>+	struct rtl_dualmac_easy_concurrent_ctl easy_concurrent_ctl;
>+	struct rtl_dmsp_ctl dmsp_ctl;
> 	struct rtl_locks locks;
> 	struct rtl_works works;
> 	struct rtl_mac mac80211;
>@@ -1685,6 +1764,9 @@ struct rtl_priv {
> 
> 	struct rtl_rate_priv *rate_priv;
> 
>+	/* sta entry list for ap adhoc or mesh */
>+	struct list_head entry_list;
>+
> 	struct rtl_debug dbg;
> 	int max_fw_size;
> 
>@@ -2111,4 +2193,11 @@ static inline struct ieee80211_sta *get_sta(struct ieee80211_hw *hw,
> 	return ieee80211_find_sta(vif, bssid);
> }
> 
>+static inline struct ieee80211_sta *rtl_find_sta(struct ieee80211_hw *hw,
>+		u8 *mac_addr)
>+{
>+	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
>+	return ieee80211_find_sta(mac->vif, mac_addr);
>+}
>+
> #endif
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 797709: 565954 | 592503 | 593847 | 593848 | 597390 | 597641 | 598918 | 598919 | 598920 | 598921 | 598922 | 598924