diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-26 06:11:19 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-26 06:11:19 +0300 |
| commit | 71ee0307f504764dd1d9fd9bd04213f210567600 (patch) | |
| tree | 73165e856fe64a2bf64a20fc256b8161b3a66f3e /include | |
| parent | 8c7314c65a1e413de3fb409f28e3ba55429d6996 (diff) | |
| parent | 91ed81f9abc76d5a61b07cb8286c680c9330b7a1 (diff) | |
| download | linux-71ee0307f504764dd1d9fd9bd04213f210567600.tar.xz | |
Merge branch 'gtp-sgsn-side-tunnel'
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/gtp.h | 3 | ||||
| -rw-r--r-- | include/uapi/linux/if_link.h | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/uapi/linux/gtp.h b/include/uapi/linux/gtp.h index 72a04a0e8cce..57d1edb8efd9 100644 --- a/include/uapi/linux/gtp.h +++ b/include/uapi/linux/gtp.h @@ -19,7 +19,8 @@ enum gtp_attrs { GTPA_LINK, GTPA_VERSION, GTPA_TID, /* for GTPv0 only */ - GTPA_SGSN_ADDRESS, + GTPA_PEER_ADDRESS, /* Remote GSN peer, either SGSN or GGSN */ +#define GTPA_SGSN_ADDRESS GTPA_PEER_ADDRESS /* maintain legacy attr name */ GTPA_MS_ADDRESS, GTPA_FLOW, GTPA_NET_NS_FD, diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index 320fc1e747ee..8b405afb2376 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -538,11 +538,18 @@ enum { #define IFLA_PPP_MAX (__IFLA_PPP_MAX - 1) /* GTP section */ + +enum ifla_gtp_role { + GTP_ROLE_GGSN = 0, + GTP_ROLE_SGSN, +}; + enum { IFLA_GTP_UNSPEC, IFLA_GTP_FD0, IFLA_GTP_FD1, IFLA_GTP_PDP_HASHSIZE, + IFLA_GTP_ROLE, __IFLA_GTP_MAX, }; #define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1) |