Merge branch 'gtp-sgsn-side-tunnel'

Browse source

Jonas Bonn says:

====================
GTP SGSN-side tunnel

Changes since v4:

* Respin the series on top of net-next; the conflicts were trivial,
  amounting to just code having been shifted about
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2017-03-25 20:11:19 -07:00

parent 8c7314c65a 91ed81f9ab

commit 71ee0307f5

3 changed files with 50 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

64

drivers/net/gtp.c

View file

3

include/uapi/linux/gtp.h

View file

7

include/uapi/linux/if_link.h

View file