diff options
author | David S. Miller <davem@davemloft.net> | 2015-04-12 21:25:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-04-12 21:25:14 -0400 |
commit | 1ceb0b8ca5be40d32b0fcf57b117cfb595c9bbfa (patch) | |
tree | 3593ce71a5a16427c35823a073072292a0d2a704 /net/core/net-procfs.c | |
parent | d72da6aa00497ed86836a1d41fc55e2809a8ca18 (diff) | |
parent | 7a6c8c34e5b71ac50e39588e20b39494a9e1d8e5 (diff) | |
download | talos-obmc-linux-1ceb0b8ca5be40d32b0fcf57b117cfb595c9bbfa.tar.gz talos-obmc-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/net-procfs.c')
0 files changed, 0 insertions, 0 deletions