diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-27 20:26:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-27 20:26:59 -0500 |
| commit | 33f8a0458b2ce4546b681c5fae04427e3077a543 (patch) | |
| tree | dc7e9750666fa02b19e0dad4aa8b514403f5e4ae /net/wireless | |
| parent | 5a717f4f8f2830f297b5511022481bdc27b9d576 (diff) | |
| parent | 159a55a64d44acbbd6f0d8f3c082e628d6d75670 (diff) | |
| download | linux-33f8a0458b2ce4546b681c5fae04427e3077a543.tar.gz linux-33f8a0458b2ce4546b681c5fae04427e3077a543.tar.xz | |
Merge tag 'wireless-drivers-next-for-davem-2016-11-25' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for 4.10
Major changes:
iwlwifi
* finalize and enable dynamic queue allocation
* use dev_coredumpmsg() to prevent locking the driver
* small fix to pass the AID to the FW
* use FW PS decisions with multi-queue
ath9k
* add device tree bindings
* switch to use mac80211 intermediate software queues to reduce
latency and fix bufferbloat
wl18xx
* allow scanning in AP mode
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/lib80211_crypt_tkip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/lib80211_crypt_tkip.c b/net/wireless/lib80211_crypt_tkip.c index 71447cf86306..ba0a1f398ce5 100644 --- a/net/wireless/lib80211_crypt_tkip.c +++ b/net/wireless/lib80211_crypt_tkip.c @@ -556,7 +556,7 @@ static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr) memcpy(hdr, hdr11->addr3, ETH_ALEN); /* DA */ memcpy(hdr + ETH_ALEN, hdr11->addr4, ETH_ALEN); /* SA */ break; - case 0: + default: memcpy(hdr, hdr11->addr1, ETH_ALEN); /* DA */ memcpy(hdr + ETH_ALEN, hdr11->addr2, ETH_ALEN); /* SA */ break; |