Merge branch 'fou-next'
authorDavid S. Miller <davem@davemloft.net>
Mon, 13 Apr 2015 01:25:14 +0000 (21:25 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 13 Apr 2015 01:25:14 +0000 (21:25 -0400)
commit1ceb0b8ca5be40d32b0fcf57b117cfb595c9bbfa
tree3593ce71a5a16427c35823a073072292a0d2a704
parentd72da6aa00497ed86836a1d41fc55e2809a8ca18
parent7a6c8c34e5b71ac50e39588e20b39494a9e1d8e5
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>