summaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_state.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-03-29 22:23:26 +0200
committerDavid S. Miller <davem@davemloft.net>2018-03-29 22:23:26 +0200
commite15f20ea33b8e5074145abe464b4b48acea505d9 (patch)
treead173bb9facf7b0673a2cc313c2d52778b8f18ff /net/xfrm/xfrm_state.c
parentMerge branch 'dsa-Add-ATU-VTU-statistics' (diff)
parentmac80211: don't WARN on bad WMM parameters from buggy APs (diff)
downloadlinux-e15f20ea33b8e5074145abe464b4b48acea505d9.tar.xz
linux-e15f20ea33b8e5074145abe464b4b48acea505d9.zip
Merge tag 'mac80211-next-for-davem-2018-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says: ==================== We have a fair number of patches, but many of them are from the first bullet here: * EAPoL-over-nl80211 from Denis - this will let us fix some long-standing issues with bridging, races with encryption and more * DFS offload support from the qtnfmac folks * regulatory database changes for the new ETSI adaptivity requirements * various other fixes and small enhancements ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_state.c')
0 files changed, 0 insertions, 0 deletions