summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authoryuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>2017-06-18 10:52:04 -0400
committerDavid S. Miller <davem@davemloft.net>2017-06-20 13:30:15 -0400
commitb952f4dff2751252db073c27c0f8a16a416a2ddc (patch)
treefda132505741ee4d859ae09f45966656ea557572 /net/mac80211/mlme.c
parentad941e693b24ad8b13c28382d323552ef6fb434b (diff)
net: manual clean code which call skb_put_[data:zero]
Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 7be7917e1541..b588e593b0ec 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -796,8 +796,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
796 after_ric, 796 after_ric,
797 ARRAY_SIZE(after_ric), 797 ARRAY_SIZE(after_ric),
798 offset); 798 offset);
799 pos = skb_put_data(skb, assoc_data->ie + offset, 799 skb_put_data(skb, assoc_data->ie + offset, noffset - offset);
800 noffset - offset);
801 offset = noffset; 800 offset = noffset;
802 } 801 }
803 802
@@ -834,8 +833,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
834 noffset = ieee80211_ie_split(assoc_data->ie, assoc_data->ie_len, 833 noffset = ieee80211_ie_split(assoc_data->ie, assoc_data->ie_len,
835 before_vht, ARRAY_SIZE(before_vht), 834 before_vht, ARRAY_SIZE(before_vht),
836 offset); 835 offset);
837 pos = skb_put_data(skb, assoc_data->ie + offset, 836 skb_put_data(skb, assoc_data->ie + offset, noffset - offset);
838 noffset - offset);
839 offset = noffset; 837 offset = noffset;
840 } 838 }
841 839
@@ -848,8 +846,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
848 noffset = ieee80211_ie_split_vendor(assoc_data->ie, 846 noffset = ieee80211_ie_split_vendor(assoc_data->ie,
849 assoc_data->ie_len, 847 assoc_data->ie_len,
850 offset); 848 offset);
851 pos = skb_put_data(skb, assoc_data->ie + offset, 849 skb_put_data(skb, assoc_data->ie + offset, noffset - offset);
852 noffset - offset);
853 offset = noffset; 850 offset = noffset;
854 } 851 }
855 852
@@ -868,8 +865,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
868 /* add any remaining custom (i.e. vendor specific here) IEs */ 865 /* add any remaining custom (i.e. vendor specific here) IEs */
869 if (assoc_data->ie_len) { 866 if (assoc_data->ie_len) {
870 noffset = assoc_data->ie_len; 867 noffset = assoc_data->ie_len;
871 pos = skb_put_data(skb, assoc_data->ie + offset, 868 skb_put_data(skb, assoc_data->ie + offset, noffset - offset);
872 noffset - offset);
873 } 869 }
874 870
875 if (assoc_data->fils_kek_len && 871 if (assoc_data->fils_kek_len &&