diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-13 13:52:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-13 13:52:37 -0400 |
| commit | 0e74008b668febb7ae024c7ee04b30dcbd1f1efd (patch) | |
| tree | 5855fc175486d4f4b1a79cbaaf26b5967569e584 /net/mac80211/mesh_plink.c | |
| parent | 5952b0200e9a0b0bfcc367d03a8caeb53e42545e (diff) | |
| parent | 4524667b1e6801a92a4de066788e558b71fe323a (diff) | |
Merge tag 'mac80211-next-for-davem-2017-06-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
A couple of weeks worth of updates - looks like things are quiet:
* merged net-next back to get a patch from net that another patch
here depends on
* various small improvements/cleanups across the board
* 4-way handshake offload (many thanks to Arend for shepherding that)
* mesh CSA/DFS support in mac80211
* the skb_put_zero() we discussed previously
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/mesh_plink.c')
| -rw-r--r-- | net/mac80211/mesh_plink.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 1131cd504a15..82cfd232a25e 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -264,8 +264,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, band = sband->band; /* capability info */ - pos = skb_put(skb, 2); - memset(pos, 0, 2); + pos = skb_put_zero(skb, 2); if (action == WLAN_SP_MESH_PEERING_CONFIRM) { /* AID */ pos = skb_put(skb, 2); |