Johannes Berg
59862b0429
mac80211: fix VLAN handling with TXQs ...
commit 53168215909281a09d3afc6fb51a9d4f81f74d39 upstream.
With TXQs, the AP_VLAN interfaces are resolved to their owner AP
interface when enqueuing the frame, which makes sense since the
frame really goes out on that as far as the driver is concerned.
However, this introduces a problem: frames to be encrypted with
a VLAN-specific GTK will now be encrypted with the AP GTK, since
the information about which virtual interface to use to select
the key is taken from the TXQ.
Fix this by preserving info->control.vif and using that in the
dequeue function. This now requires doing the driver-mapping
in the dequeue as well.
Since there's no way to filter the frames that are sitting on a
TXQ, drop all frames, which may affect other interfaces, when an
AP_VLAN is removed.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-10-05 09:43:58 +02:00
9p: switch p9_client_read() to passing struct iov_iter *
2015-04-11 22:28:27 -04:00
Bluetooth: Fix using the correct source address type
2016-11-22 22:50:46 +01:00
s390/iucv: do not use arrays as argument
2015-09-21 16:03:04 -07:00
netfilter: nat: fix crash when conntrack entry is re-used
2016-11-24 14:43:35 +01:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-09-25 23:34:19 +02:00
NFC: digital: Add support for NFC DEP Response Waiting Time
2016-07-11 02:01:14 +02:00
sock: struct proto hash function may error
2016-02-11 03:54:14 -05:00
sctp: fix the check for _sctp_walk_params and _sctp_walk_errors
2017-08-11 08:49:33 -07:00
net_sched: act_vlan: add helper inlines to access tcf_vlan info
2016-09-23 07:22:11 -04:00
6lowpan: add 802.15.4 short addr slaac
2016-06-15 20:41:22 -07:00
net_sched: convert tcf_exts from list to pointer array
2016-08-17 19:27:51 -04:00
ipv6: reorder ip6_route_dev_notifier after ipv6_dev_notf
2017-05-14 14:00:21 +02:00
ieee802154: af_ieee802154: fix typo in comment.
2015-09-17 13:20:05 +02:00
rxrpc: Rewrite the data and ack handling code
2016-09-08 11:10:12 +01:00
af_unix: split 'u->readlock' into two: 'iolock' and 'bindlock'
2016-09-04 13:29:29 -07:00
VSOCK: Introduce virtio_vsock_common.ko
2016-08-02 02:57:29 +03:00
ax25: Stop using sock->sk_protinfo.
2015-06-28 16:55:44 -07:00
bonding: 3ad: apply ad_actor settings changes immediately
2016-02-09 04:45:49 -05:00
bonding: convert num_grat_arp to the new bonding option API
2015-07-27 01:05:24 -07:00
bonding: quit messing with IOCTL
2016-09-27 21:15:21 -04:00
net: un-inline sk_busy_loop()
2015-11-18 16:17:38 -05:00
calipso: Add a label cache.
2016-06-27 15:06:17 -04:00
cfg80211/mac80211: fix BSS leaks when abandoning assoc attempts
2017-01-09 08:32:17 +01:00
ieee802154: add netns support
2016-07-08 12:20:57 +02:00
csum: Update csum_block_add to use rotate instead of byteswap
2016-03-13 15:01:00 -04:00
netlabel: out of bound access in cipso_v4_validate()
2017-02-18 15:11:41 +01:00
cls_cgroup: get sk_classid only from full sockets
2016-04-19 20:09:25 -04:00
codel: split into multiple files
2016-04-25 16:44:27 -04:00
codel: split into multiple files
2016-04-25 16:44:27 -04:00
net_sched: fq_codel: cache skb->truesize into skb->cb
2016-06-25 12:19:35 -04:00
packet: compat support for sock_fprog
2016-06-09 23:41:03 -07:00
devlink: remove unused priv_size
2016-08-26 11:55:18 -07:00
netfilter: Pass net into okfn
2015-09-17 17:18:37 -07:00
net: dsa: add port fast ageing
2016-09-23 08:38:50 -04:00
ipv4: add reference counting to metrics
2017-06-07 12:07:46 +02:00
net: add dst_cache support
2016-02-16 20:21:48 -05:00
net/dst: Utility functions to build dst_metadata without supplying an skb
2016-09-10 20:53:55 -07:00
ipv4, ipv6: Pass net into __ip_local_out and __ip6_local_out
2015-10-08 04:27:02 -07:00
net/ethoc: support big-endian register layout
2015-09-23 15:33:15 -07:00
net: Add l3mdev rule
2016-06-08 11:36:02 -07:00
net: flow: Remove FLOWI_FLAG_L3MDEV_SRC flag
2016-09-10 23:12:53 -07:00
rps: flow_dissector: Add the const for the parameter of flow_keys_have_l4
2016-09-01 16:51:08 -07:00
fou: Add encap ops for IPv6 tunnels
2016-05-20 18:03:16 -04:00
fq.h: Port memory limit mechanism from fq_codel
2016-09-30 13:29:21 +02:00
fq.h: Port memory limit mechanism from fq_codel
2016-09-30 13:29:21 +02:00
net: sched: do not acquire qdisc spinlock in qdisc/class stats dump
2016-06-07 16:37:14 -07:00
Revert "genl: Add genlmsg_new_unicast() for unicast message allocation"
2016-02-18 11:42:19 -05:00
net: Remove deprecated tunnel specific UDP offload functions
2016-06-17 20:23:32 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-08-18 01:17:32 -04:00
gro_cells: mark napi struct as not busy poll candidates
2016-11-15 22:27:27 -05:00
gtp: #define #define _GTP_H_ and not #define _GTP_H
2016-07-25 17:55:43 -07:00
net: add a hardware buffer management helper API
2016-03-14 12:19:46 -04:00
net: snmp: kill STATS_BH macros
2016-04-27 22:48:25 -04:00
mac80211: add support for radiotap timestamp field
2016-09-12 11:45:45 +02:00
mac802154: constify ieee802154_llsec_ops structure
2016-01-04 20:40:41 +01:00
IPv6: fix DESYNC_FACTOR
2016-10-14 10:59:15 -04:00
ila: Add generic ILA translation facility
2015-12-15 23:25:20 -05:00
ipv6: remove unused in6_addr struct
2016-03-22 15:45:44 -04:00
tcp/dccp: do not touch listener sk_refcnt under synflood
2016-04-04 22:11:20 -04:00
ip4ip6: Support for GSO/GRO
2016-05-20 18:03:17 -04:00
tcp: increase ICSK_CA_PRIV_SIZE from 64 bytes to 88
2016-09-21 00:23:01 -04:00
ipv6: suppress sparse warnings in IP6_ECN_set_ce()
2016-08-13 15:08:00 -07:00
Revert "net: fix percpu memory leaks"
2017-09-20 08:19:55 +02:00
tcp/dccp: do not touch listener sk_refcnt under synflood
2016-04-04 22:11:20 -04:00
ipv6: Allow request socks to contain IPv6 options.
2016-06-27 15:05:28 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-20 06:08:27 -07:00
inet: tcp: fix inetpeer_set_addr_v4()
2015-12-16 00:14:12 -05:00
ipv4: better IP_MAX_MTU enforcement
2017-08-30 10:21:40 +02:00
ipv6: Pass proto to csum_ipv6_magic as __u8 instead of unsigned short
2016-03-13 23:55:13 -04:00
ipv6: fix sparse warning on rt6i_node
2017-09-20 08:19:53 +02:00
net: ipv6: Compare lwstate in detecting duplicate nexthops
2017-07-21 07:42:19 +02:00
ip6_tunnel: Clear IP6CB in ip6tunnel_xmit()
2016-11-02 15:18:36 -04:00
ipv4: add reference counting to metrics
2017-06-07 12:07:46 +02:00
ip_tunnel: add collect_md mode to IPIP tunnel
2016-09-17 10:13:07 -04:00
ipvs: update real-server binding of outgoing connections in SIP-pe
2016-06-06 09:47:25 +09:00
ipv6: fix flow labels when the traffic class is non-0
2017-06-17 06:41:52 +02:00
wext: handle NULL extra data in iwe_stream_add_point better
2017-08-11 08:49:34 -07:00
kcm: Use stream parser
2016-08-17 19:36:23 -04:00
net: ipv4: Do not drop to make_route if oif is l3mdev
2016-10-13 12:05:26 -04:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
lwtunnel: valid encap attr check should return 0 when lwtunnel is disabled
2017-02-18 15:11:42 +01:00
mac80211: fix VLAN handling with TXQs
2017-10-05 09:43:58 +02:00
ieee802154: cleanup WARN_ON for fc fetch
2016-07-08 13:23:12 +02:00
openvswitch: use mpls_hdr
2016-10-03 02:00:22 -04:00
mpls: multipath route support
2015-10-23 06:26:42 -07:00
net/ncsi: Introduce ncsi_stop_dev()
2016-10-04 02:11:51 -04:00
6lowpan: introduce 6lowpan-nd
2016-06-15 20:41:23 -07:00
net: add explicit logging and stat for neighbour table overflow
2015-08-10 13:46:21 -07:00
netns: fix get_net_ns_by_fd(int pid) typo
2016-11-18 14:01:58 -05:00
neigh: Send a notification when DELAY_PROBE_TIME changes
2016-07-05 09:06:29 -07:00
netlabel: Implement CALIPSO config functions for SMACK.
2016-06-27 15:06:18 -04:00
netlink: kill nla_put_u64()
2016-05-16 13:46:23 -04:00
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
2015-12-08 22:02:33 -05:00
ieee802154: add netns support
2016-07-08 12:20:57 +02:00
net: ping: make ping_v6_sendmsg static
2016-03-23 22:09:58 -04:00
net/sched: pkt_cls: change tc actions order to be as the user sets
2016-09-28 05:02:44 -04:00
net: sched: convert qdisc linked list to hashtable
2016-08-10 17:19:02 -07:00
pptp: Refactor the struct and macros of PPTP codes
2016-08-15 10:55:53 -07:00
udp: Remove udp_offloads
2016-04-07 16:53:30 -04:00
sock: struct proto hash function may error
2016-02-11 03:54:14 -05:00
inet: reqsk_alloc() needs to take care of dead listeners
2016-04-04 22:11:19 -04:00
net: ipv4: Remove l3mdev_get_saddr
2016-09-10 23:12:53 -07:00
net: rtnetlink: add support for the IFLA_STATS_LINK_XSTATS_SLAVE attribute
2016-06-30 06:15:04 -04:00
net_sched: fix order of queue length updates in qdisc_replace()
2017-08-30 10:21:42 +02:00
unix: correctly track in-flight fds in sending process user_struct
2016-02-08 10:30:42 -05:00
net: snmp: fix 64bit stats on 32bit arches
2016-04-28 11:49:45 -04:00
dccp: do not release listeners too soon
2016-11-03 16:16:50 -04:00
soreuseport: fix NULL ptr dereference SO_REUSEPORT after bind
2016-01-19 14:44:23 -05:00
kcm: Remove TCP specific references from kcm and strparser
2016-08-28 23:32:41 -04:00
switchdev: remove FIB offload infrastructure
2016-09-28 04:48:00 -04:00
tcp: take care of truncations done by sk_filter()
2016-11-13 12:30:02 -05:00
inet: add TCP_NEW_SYN_RECV state
2015-03-12 22:58:12 -04:00
inet: remove BUG_ON() in twsk_destructor()
2015-07-09 15:12:20 -07:00
ipv6: add new struct ipcm6_cookie
2016-05-03 16:08:14 -04:00
net: tso: add support for IPv6
2015-10-26 22:24:22 -07:00
udp: must lock the socket in udp_disconnect()
2016-10-20 14:45:52 -04:00
vxlan: Add new UDP encapsulation offload type for VXLAN-GPE
2016-06-17 20:23:32 -07:00
vxlan: fix hlist corruption
2017-07-21 07:42:18 +02:00
xfrm: fix stack access out of bounds with CONFIG_XFRM_SUB_POLICY
2017-07-05 14:40:28 +02:00
59862b0429