summaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_conntrack_standalone.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-07-06 22:32:15 -0700
committerDavid S. Miller <davem@davemloft.net>2016-07-06 22:32:15 -0700
commita90a6e55f34f28190e4dc2a6a3660ef157827a8f (patch)
tree9bd13d11e4a857bef0a2ea24bece7f6de981b52c /net/netfilter/nf_conntrack_standalone.c
parentfcf752ae19c1a79e90b8613ffb51c845594e3692 (diff)
parent7d27a0ba7adc8ef30c2aae7592fce4c162aee4df (diff)
downloadop-kernel-dev-a90a6e55f34f28190e4dc2a6a3660ef157827a8f.zip
op-kernel-dev-a90a6e55f34f28190e4dc2a6a3660ef157827a8f.tar.gz
Merge tag 'mac80211-next-for-davem-2016-07-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says: ==================== One more set of new features: * beacon report (for radio measurement) support in cfg80211/mac80211 * hwsim: allow wmediumd in namespaces * mac80211: extend 160MHz workaround to CSA IEs * mesh: properly encrypt group-addressed privacy action frames * mesh: allow setting peer AID * first steps for MU-MIMO monitor mode * along with various other cleanups and improvements ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_standalone.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud