rtlwifi: Fill in_4way field by driver

Because it isn't always correct to use EAPOL to check 4-way,
we add a timer to handle exception.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Yan-Hsuan Chuang <yhchuang@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index 208f56297a7574a831b3c4d3e5690f8e829555df..1231ca5879d6135fba5c51cac177622e507c58ed 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -1408,6 +1408,11 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx,
 
                return true;
        } else if (ETH_P_PAE == ether_type) {
+               /* EAPOL is seens as in-4way */
+               rtlpriv->btcoexist.btc_info.in_4way = true;
+               rtlpriv->btcoexist.btc_info.in_4way_ts = jiffies;
+       rtlpriv->btcoexist.btc_info.in_4way_ts = jiffies;
+
                RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
                         "802.1X %s EAPOL pkt!!\n", (is_tx) ? "Tx" : "Rx");
 
@@ -1959,6 +1964,12 @@ label_lps_done:
        if (rtlpriv->cfg->ops->get_btc_status())
                rtlpriv->btcoexist.btc_ops->btc_periodical(rtlpriv);
 
+       if (rtlpriv->btcoexist.btc_info.in_4way) {
+               if (time_after(jiffies, rtlpriv->btcoexist.btc_info.in_4way_ts +
+                              msecs_to_jiffies(IN_4WAY_TIMEOUT_TIME)))
+                       rtlpriv->btcoexist.btc_info.in_4way = false;
+       }
+
        rtlpriv->link_info.bcn_rx_inperiod = 0;
 
        /* <6> scan list */

diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
index b0ad061048c5c7e43d028e788855933b55c7ccbf..c53cbf3d52bdd960a44f7be0d49a5f067ac80560 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
@@ -1505,6 +1505,8 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
        u8 mac_addr[ETH_ALEN];
        u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
+       rtlpriv->btcoexist.btc_info.in_4way = false;
+
        if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                         "not open hw encryption\n");

diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index fb1ebb01133f8ffba8dd785cfe27b1052a0e56f3..7ec0d502a0d958630271c23205c847e870d4ded1 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -2477,6 +2477,8 @@ struct rtl_global_var {
        spinlock_t glb_list_lock;
 };
 
+#define IN_4WAY_TIMEOUT_TIME   (30 * MSEC_PER_SEC)     /* 30 seconds */
+
 struct rtl_btc_info {
        u8 bt_type;
        u8 btcoexist;
@@ -2485,6 +2487,7 @@ struct rtl_btc_info {
 
        u8 ap_num;
        bool in_4way;
+       unsigned long in_4way_ts;
 };
 
 struct bt_coexist_info {