mwifiex: add missing IEs related to TDLS operation

In mwifiex,IEs such as supported channels, supported operating classes
20/40 BSS COexistence are missing and also extra QOS capabilities IE
is added during TDLS discovery response, TDLS setup request and
TDLS setupresponse.
This patch adds require IEs and also removes extra IE.

Signed-off-by: Karthik Ananthapadmanabha <karthida@marvell.com>
Signed-off-by: Ganapathi Bhat <gbhat@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/ioctl.h b/drivers/net/wireless/marvell/mwifiex/ioctl.h
index 536ab834b12625f8ac7ccce1b309b465f82db31b..48e154e1865df321e12f4f160d51085d599d8721 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/ioctl.h
+++ b/drivers/net/wireless/marvell/mwifiex/ioctl.h
@@ -91,6 +91,8 @@ struct wep_key {
 #define MWIFIEX_TDLS_DEF_QOS_CAPAB             0xf
 #define MWIFIEX_PRIO_BK                                2
 #define MWIFIEX_PRIO_VI                                5
+#define MWIFIEX_SUPPORTED_CHANNELS             2
+#define MWIFIEX_OPERATING_CLASSES              16
 
 struct mwifiex_uap_bss_param {
        u8 channel;

diff --git a/drivers/net/wireless/marvell/mwifiex/tdls.c b/drivers/net/wireless/marvell/mwifiex/tdls.c
index e228c03f98f6605fa1b60f83ca0481d68e50a64e..6e507c99e7927c7ae3792421f0105b5927e838d3 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/tdls.c
+++ b/drivers/net/wireless/marvell/mwifiex/tdls.c
@@ -431,6 +431,41 @@ mwifiex_add_wmm_info_ie(struct mwifiex_private *priv, struct sk_buff *skb,
        *buf++ = qosinfo; /* U-APSD no in use */
 }
 
+static void mwifiex_tdls_add_bss_co_2040(struct sk_buff *skb)
+{
+       struct ieee_types_bss_co_2040 *bssco;
+
+       bssco = (void *)skb_put(skb, sizeof(struct ieee_types_bss_co_2040));
+       bssco->ieee_hdr.element_id = WLAN_EID_BSS_COEX_2040;
+       bssco->ieee_hdr.len = sizeof(struct ieee_types_bss_co_2040) -
+                             sizeof(struct ieee_types_header);
+       bssco->bss_2040co = 0x01;
+}
+
+static void mwifiex_tdls_add_supported_chan(struct sk_buff *skb)
+{
+       struct ieee_types_generic *supp_chan;
+       u8 chan_supp[] = {1, 11};
+
+       supp_chan = (void *)skb_put(skb, (sizeof(struct ieee_types_header) +
+                                         sizeof(chan_supp)));
+       supp_chan->ieee_hdr.element_id = WLAN_EID_SUPPORTED_CHANNELS;
+       supp_chan->ieee_hdr.len = sizeof(chan_supp);
+       memcpy(supp_chan->data, chan_supp, sizeof(chan_supp));
+}
+
+static void mwifiex_tdls_add_oper_class(struct sk_buff *skb)
+{
+       struct ieee_types_generic *reg_class;
+       u8 rc_list[] = {1,
+               1, 2, 3, 4, 12, 22, 23, 24, 25, 27, 28, 29, 30, 32, 33};
+       reg_class = (void *)skb_put(skb, (sizeof(struct ieee_types_header) +
+                                         sizeof(rc_list)));
+       reg_class->ieee_hdr.element_id = WLAN_EID_SUPPORTED_REGULATORY_CLASSES;
+       reg_class->ieee_hdr.len = sizeof(rc_list);
+       memcpy(reg_class->data, rc_list, sizeof(rc_list));
+}
+
 static int mwifiex_prep_tdls_encap_data(struct mwifiex_private *priv,
                                        const u8 *peer, u8 action_code,
                                        u8 dialog_token,
@@ -484,7 +519,9 @@ static int mwifiex_prep_tdls_encap_data(struct mwifiex_private *priv,
                }
 
                mwifiex_tdls_add_ext_capab(priv, skb);
-               mwifiex_tdls_add_qos_capab(skb);
+               mwifiex_tdls_add_bss_co_2040(skb);
+               mwifiex_tdls_add_supported_chan(skb);
+               mwifiex_tdls_add_oper_class(skb);
                mwifiex_add_wmm_info_ie(priv, skb, 0);
                break;
 
@@ -522,7 +559,9 @@ static int mwifiex_prep_tdls_encap_data(struct mwifiex_private *priv,
                }
 
                mwifiex_tdls_add_ext_capab(priv, skb);
-               mwifiex_tdls_add_qos_capab(skb);
+               mwifiex_tdls_add_bss_co_2040(skb);
+               mwifiex_tdls_add_supported_chan(skb);
+               mwifiex_tdls_add_oper_class(skb);
                mwifiex_add_wmm_info_ie(priv, skb, 0);
                break;
 
@@ -612,6 +651,9 @@ int mwifiex_send_tdls_data_frame(struct mwifiex_private *priv, const u8 *peer,
                  sizeof(struct ieee_types_bss_co_2040) +
                  sizeof(struct ieee80211_ht_operation) +
                  sizeof(struct ieee80211_tdls_lnkie) +
+                 (2 * (sizeof(struct ieee_types_header))) +
+                  MWIFIEX_SUPPORTED_CHANNELS +
+                  MWIFIEX_OPERATING_CLASSES +
                  sizeof(struct ieee80211_wmm_param_ie) +
                  extra_ies_len;
 
@@ -760,7 +802,10 @@ mwifiex_construct_tdls_action_frame(struct mwifiex_private *priv,
                }
 
                mwifiex_tdls_add_ext_capab(priv, skb);
+               mwifiex_tdls_add_bss_co_2040(skb);
+               mwifiex_tdls_add_supported_chan(skb);
                mwifiex_tdls_add_qos_capab(skb);
+               mwifiex_tdls_add_oper_class(skb);
                break;
        default:
                mwifiex_dbg(priv->adapter, ERROR, "Unknown TDLS action frame type\n");