summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-04-13 03:25:14 +0200
committerDavid S. Miller <davem@davemloft.net>2015-04-13 03:25:14 +0200
commit1ceb0b8ca5be40d32b0fcf57b117cfb595c9bbfa (patch)
tree3593ce71a5a16427c35823a073072292a0d2a704 /net/core
parentMerge branch 'selinux_xfrm_nl_cmd' (diff)
parentfou: implement FOU_CMD_GET (diff)
downloadlinux-1ceb0b8ca5be40d32b0fcf57b117cfb595c9bbfa.tar.xz
linux-1ceb0b8ca5be40d32b0fcf57b117cfb595c9bbfa.zip
Merge branch 'fou-next'
Cong Wang says: ==================== fou: some fixes and updates Patch 1~3 fix some minor bugs in net/ipv4/fou.c, the only thing I am not sure is if it's too late to change the byte order of FOU_ATTR_PORT, if so we have to fix iproute2 instead of kernel. Patch 4~5 add some new features to make it complete. v2: make fou->port be16 too ==================== Acked-by: Tom Herbert <tom@herbertland.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
0 files changed, 0 insertions, 0 deletions