[Feature][T106][task-view-74]Based on baseline p56u06 first and fifth patch WiFi part and patch caused mac failure and gpio setting input low failure modification
Only Configure: Yes
Affected branch: master
Affected module: wifi
Is it affected on both ZXIC and MTK:only ZXIC
Self-test: Yes
Doc Update:No
Change-Id: I06a6b61b6e229f4f9f4e949e98c0454110be810c
(cherry picked from commit c08ce0473788b867365d436b4275e58672c7e43a)
diff --git a/ap/os/linux/linux-3.4.x/include/net/cfg80211.h b/ap/os/linux/linux-3.4.x/include/net/cfg80211.h
index 4580f0e..a090989 100755
--- a/ap/os/linux/linux-3.4.x/include/net/cfg80211.h
+++ b/ap/os/linux/linux-3.4.x/include/net/cfg80211.h
@@ -1078,7 +1078,7 @@
*/
enum cfg80211_assoc_req_flags {
ASSOC_REQ_DISABLE_HT = BIT(0),
-#if defined(CONFIG_AIC8800)
+#if (defined CONFIG_AIC8800 || defined CONFIG_AIC8800D80L)
ASSOC_REQ_DISABLE_VHT = BIT(1),
ASSOC_REQ_USE_RRM = BIT(2),
CONNECT_REQ_EXTERNAL_AUTH_SUPPORT = BIT(3),
@@ -1232,7 +1232,7 @@
u8 *ie;
size_t ie_len;
bool privacy;
-#if defined(CONFIG_AIC8800)
+#if (defined CONFIG_AIC8800 || defined CONFIG_AIC8800D80L)
enum nl80211_mfp mfp;
#endif
struct cfg80211_crypto_settings crypto;
@@ -1333,7 +1333,7 @@
u8 replay_ctr[NL80211_REPLAY_CTR_LEN];
};
-#if defined(CONFIG_AIC8800)
+#if (defined CONFIG_AIC8800 || defined CONFIG_AIC8800D80L)
/**
* struct cfg80211_external_auth_params - Trigger External authentication.
*
@@ -1744,7 +1744,7 @@
u16 noack_map);
struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy);
-#if defined(CONFIG_AIC8800)
+#if (defined CONFIG_AIC8800 || defined CONFIG_AIC8800D80L)
int (*external_auth)(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_external_auth_params *params);
#endif
@@ -2330,7 +2330,7 @@
} sme_state;
struct cfg80211_conn *conn;
struct cfg80211_cached_keys *connect_keys;
-#if defined(CONFIG_AIC8800)
+#if (defined CONFIG_AIC8800 || defined CONFIG_AIC8800D80L)
u32 conn_owner_nlportid;
u8 disconnect_bssid[ETH_ALEN];
#endif
@@ -3393,7 +3393,7 @@
const u8 *frame, size_t len,
int freq, int sig_dbm, gfp_t gfp);
-#if defined(CONFIG_AIC8800)
+#if (defined CONFIG_AIC8800 || defined CONFIG_AIC8800D80L)
/**
* cfg80211_external_auth_request - userspace request for authentication
* @netdev: network device
diff --git a/ap/os/linux/linux-3.4.x/include/net/netlink.h b/ap/os/linux/linux-3.4.x/include/net/netlink.h
index 3996aaf..cba811f 100755
--- a/ap/os/linux/linux-3.4.x/include/net/netlink.h
+++ b/ap/os/linux/linux-3.4.x/include/net/netlink.h
@@ -174,7 +174,7 @@
NLA_NESTED_COMPAT,
NLA_NUL_STRING,
NLA_BINARY,
-#if defined(CONFIG_AIC8800)
+#if (defined CONFIG_AIC8800 || defined CONFIG_AIC8800D80L)
NLA_S8,
NLA_S16,
NLA_S32,
@@ -790,7 +790,7 @@
*/
static inline int nla_put_u32(struct sk_buff *skb, int attrtype, u32 value)
{
-#if defined(CONFIG_AIC8800)
+#if (defined CONFIG_AIC8800 || defined CONFIG_AIC8800D80L)
u32 tmp = value;
return nla_put(skb, attrtype, sizeof(u32), &tmp);