summaryrefslogtreecommitdiffstats
path: root/net/mac80211/tdls.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/tdls.c')
-rw-r--r--net/mac80211/tdls.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c
index 86740670102d..709ef02fe67e 100644
--- a/net/mac80211/tdls.c
+++ b/net/mac80211/tdls.c
@@ -49,7 +49,7 @@ static void ieee80211_tdls_add_ext_capab(struct ieee80211_sub_if_data *sdata,
49 !ifmgd->tdls_wider_bw_prohibited; 49 !ifmgd->tdls_wider_bw_prohibited;
50 struct ieee80211_supported_band *sband = ieee80211_get_sband(sdata); 50 struct ieee80211_supported_band *sband = ieee80211_get_sband(sdata);
51 bool vht = sband && sband->vht_cap.vht_supported; 51 bool vht = sband && sband->vht_cap.vht_supported;
52 u8 *pos = (void *)skb_put(skb, 10); 52 u8 *pos = skb_put(skb, 10);
53 53
54 *pos++ = WLAN_EID_EXT_CAPABILITY; 54 *pos++ = WLAN_EID_EXT_CAPABILITY;
55 *pos++ = 8; /* len */ 55 *pos++ = 8; /* len */
@@ -168,7 +168,7 @@ static void ieee80211_tdls_add_oper_classes(struct ieee80211_sub_if_data *sdata,
168 168
169static void ieee80211_tdls_add_bss_coex_ie(struct sk_buff *skb) 169static void ieee80211_tdls_add_bss_coex_ie(struct sk_buff *skb)
170{ 170{
171 u8 *pos = (void *)skb_put(skb, 3); 171 u8 *pos = skb_put(skb, 3);
172 172
173 *pos++ = WLAN_EID_BSS_COEX_2040; 173 *pos++ = WLAN_EID_BSS_COEX_2040;
174 *pos++ = 1; /* len */ 174 *pos++ = 1; /* len */
@@ -209,7 +209,7 @@ static void ieee80211_tdls_add_link_ie(struct ieee80211_sub_if_data *sdata,
209 rsp_addr = sdata->vif.addr; 209 rsp_addr = sdata->vif.addr;
210 } 210 }
211 211
212 lnkid = (void *)skb_put(skb, sizeof(struct ieee80211_tdls_lnkie)); 212 lnkid = skb_put(skb, sizeof(struct ieee80211_tdls_lnkie));
213 213
214 lnkid->ie_type = WLAN_EID_LINK_ID; 214 lnkid->ie_type = WLAN_EID_LINK_ID;
215 lnkid->ie_len = sizeof(struct ieee80211_tdls_lnkie) - 2; 215 lnkid->ie_len = sizeof(struct ieee80211_tdls_lnkie) - 2;
@@ -223,7 +223,7 @@ static void
223ieee80211_tdls_add_aid(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb) 223ieee80211_tdls_add_aid(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)
224{ 224{
225 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; 225 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
226 u8 *pos = (void *)skb_put(skb, 4); 226 u8 *pos = skb_put(skb, 4);
227 227
228 *pos++ = WLAN_EID_AID; 228 *pos++ = WLAN_EID_AID;
229 *pos++ = 2; /* len */ 229 *pos++ = 2; /* len */
@@ -745,7 +745,7 @@ ieee80211_prep_tdls_encap_data(struct wiphy *wiphy, struct net_device *dev,
745 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); 745 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
746 struct ieee80211_tdls_data *tf; 746 struct ieee80211_tdls_data *tf;
747 747
748 tf = (void *)skb_put(skb, offsetof(struct ieee80211_tdls_data, u)); 748 tf = skb_put(skb, offsetof(struct ieee80211_tdls_data, u));
749 749
750 memcpy(tf->da, peer, ETH_ALEN); 750 memcpy(tf->da, peer, ETH_ALEN);
751 memcpy(tf->sa, sdata->vif.addr, ETH_ALEN); 751 memcpy(tf->sa, sdata->vif.addr, ETH_ALEN);