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>
This commit is contained in:

committed by
David S. Miller

parent
ad941e693b
commit
b952f4dff2
@@ -796,8 +796,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
|
||||
after_ric,
|
||||
ARRAY_SIZE(after_ric),
|
||||
offset);
|
||||
pos = skb_put_data(skb, assoc_data->ie + offset,
|
||||
noffset - offset);
|
||||
skb_put_data(skb, assoc_data->ie + offset, noffset - offset);
|
||||
offset = noffset;
|
||||
}
|
||||
|
||||
@@ -834,8 +833,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
|
||||
noffset = ieee80211_ie_split(assoc_data->ie, assoc_data->ie_len,
|
||||
before_vht, ARRAY_SIZE(before_vht),
|
||||
offset);
|
||||
pos = skb_put_data(skb, assoc_data->ie + offset,
|
||||
noffset - offset);
|
||||
skb_put_data(skb, assoc_data->ie + offset, noffset - offset);
|
||||
offset = noffset;
|
||||
}
|
||||
|
||||
@@ -848,8 +846,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
|
||||
noffset = ieee80211_ie_split_vendor(assoc_data->ie,
|
||||
assoc_data->ie_len,
|
||||
offset);
|
||||
pos = skb_put_data(skb, assoc_data->ie + offset,
|
||||
noffset - offset);
|
||||
skb_put_data(skb, assoc_data->ie + offset, noffset - offset);
|
||||
offset = noffset;
|
||||
}
|
||||
|
||||
@@ -868,8 +865,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
|
||||
/* add any remaining custom (i.e. vendor specific here) IEs */
|
||||
if (assoc_data->ie_len) {
|
||||
noffset = assoc_data->ie_len;
|
||||
pos = skb_put_data(skb, assoc_data->ie + offset,
|
||||
noffset - offset);
|
||||
skb_put_data(skb, assoc_data->ie + offset, noffset - offset);
|
||||
}
|
||||
|
||||
if (assoc_data->fils_kek_len &&
|
||||
|
@@ -388,7 +388,7 @@ ieee80211_tdls_add_setup_start_ies(struct ieee80211_sub_if_data *sdata,
|
||||
before_ext_cap,
|
||||
ARRAY_SIZE(before_ext_cap),
|
||||
offset);
|
||||
pos = skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
offset = noffset;
|
||||
}
|
||||
|
||||
@@ -417,7 +417,7 @@ ieee80211_tdls_add_setup_start_ies(struct ieee80211_sub_if_data *sdata,
|
||||
before_ht_cap,
|
||||
ARRAY_SIZE(before_ht_cap),
|
||||
offset);
|
||||
pos = skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
offset = noffset;
|
||||
}
|
||||
|
||||
@@ -488,7 +488,7 @@ ieee80211_tdls_add_setup_start_ies(struct ieee80211_sub_if_data *sdata,
|
||||
before_vht_cap,
|
||||
ARRAY_SIZE(before_vht_cap),
|
||||
offset);
|
||||
pos = skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
offset = noffset;
|
||||
}
|
||||
|
||||
@@ -529,7 +529,7 @@ ieee80211_tdls_add_setup_start_ies(struct ieee80211_sub_if_data *sdata,
|
||||
/* add any remaining IEs */
|
||||
if (extra_ies_len) {
|
||||
noffset = extra_ies_len;
|
||||
pos = skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -571,7 +571,7 @@ ieee80211_tdls_add_setup_cfm_ies(struct ieee80211_sub_if_data *sdata,
|
||||
before_qos,
|
||||
ARRAY_SIZE(before_qos),
|
||||
offset);
|
||||
pos = skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
offset = noffset;
|
||||
}
|
||||
|
||||
@@ -591,7 +591,7 @@ ieee80211_tdls_add_setup_cfm_ies(struct ieee80211_sub_if_data *sdata,
|
||||
before_ht_op,
|
||||
ARRAY_SIZE(before_ht_op),
|
||||
offset);
|
||||
pos = skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
offset = noffset;
|
||||
}
|
||||
|
||||
@@ -632,7 +632,7 @@ ieee80211_tdls_add_setup_cfm_ies(struct ieee80211_sub_if_data *sdata,
|
||||
/* add any remaining IEs */
|
||||
if (extra_ies_len) {
|
||||
noffset = extra_ies_len;
|
||||
pos = skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -645,7 +645,6 @@ ieee80211_tdls_add_chan_switch_req_ies(struct ieee80211_sub_if_data *sdata,
|
||||
{
|
||||
struct ieee80211_tdls_data *tf;
|
||||
size_t offset = 0, noffset;
|
||||
u8 *pos;
|
||||
|
||||
if (WARN_ON_ONCE(!chandef))
|
||||
return;
|
||||
@@ -663,7 +662,7 @@ ieee80211_tdls_add_chan_switch_req_ies(struct ieee80211_sub_if_data *sdata,
|
||||
before_lnkie,
|
||||
ARRAY_SIZE(before_lnkie),
|
||||
offset);
|
||||
pos = skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
offset = noffset;
|
||||
}
|
||||
|
||||
@@ -672,7 +671,7 @@ ieee80211_tdls_add_chan_switch_req_ies(struct ieee80211_sub_if_data *sdata,
|
||||
/* add any remaining IEs */
|
||||
if (extra_ies_len) {
|
||||
noffset = extra_ies_len;
|
||||
pos = skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user