From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 22 May 2014 17:58:36 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
X-Git-Tag: v3.16-rc1~27^2~122^2^2~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=40a10fd740a4d5a9f3da255cf8dae48c6723d1a6;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
---

40a10fd740a4d5a9f3da255cf8dae48c6723d1a6
diff --cc drivers/net/wireless/mwifiex/tdls.c
index 6bef47c2a70,49c8a2c64ee..e14fbb5de49
--- a/drivers/net/wireless/mwifiex/tdls.c
+++ b/drivers/net/wireless/mwifiex/tdls.c
@@@ -185,50 -186,8 +186,50 @@@ static int mwifiex_tdls_add_vht_capab(s
  	return 0;
  }
  
 +static int
 +mwifiex_tdls_add_ht_oper(struct mwifiex_private *priv, u8 *mac,
 +			 u8 vht_enabled, struct sk_buff *skb)
 +{
 +	struct ieee80211_ht_operation *ht_oper;
 +	struct mwifiex_sta_node *sta_ptr;
 +	struct mwifiex_bssdescriptor *bss_desc =
 +					&priv->curr_bss_params.bss_descriptor;
 +	u8 *pos;
 +
 +	sta_ptr = mwifiex_get_sta_entry(priv, mac);
 +	if (unlikely(!sta_ptr)) {
 +		dev_warn(priv->adapter->dev,
 +			 "TDLS peer station not found in list\n");
 +		return -1;
 +	}
 +
 +	pos = (void *)skb_put(skb, sizeof(struct ieee80211_ht_operation) + 2);
 +	*pos++ = WLAN_EID_HT_OPERATION;
 +	*pos++ = sizeof(struct ieee80211_ht_operation);
 +	ht_oper = (void *)pos;
 +
 +	ht_oper->primary_chan = bss_desc->channel;
 +
 +	/* follow AP's channel bandwidth */
 +	if (ISSUPP_CHANWIDTH40(priv->adapter->hw_dot_11n_dev_cap) &&
 +	    bss_desc->bcn_ht_cap &&
 +	    ISALLOWED_CHANWIDTH40(bss_desc->bcn_ht_oper->ht_param))
 +		ht_oper->ht_param = bss_desc->bcn_ht_oper->ht_param;
 +
 +	if (vht_enabled) {
 +		ht_oper->ht_param =
 +			  mwifiex_get_sec_chan_offset(bss_desc->channel);
 +		ht_oper->ht_param |= BIT(2);
 +	}
 +
 +	memcpy(&sta_ptr->tdls_cap.ht_oper, ht_oper,
 +	       sizeof(struct ieee80211_ht_operation));
 +
 +	return 0;
 +}
 +
  static int mwifiex_tdls_add_vht_oper(struct mwifiex_private *priv,
- 				     u8 *mac, struct sk_buff *skb)
+ 				     const u8 *mac, struct sk_buff *skb)
  {
  	struct mwifiex_bssdescriptor *bss_desc;
  	struct ieee80211_vht_operation *vht_oper;