diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-04 14:11:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-04 14:11:32 -0400 |
| commit | b8223bd1c49423a39a7da7e73cad8bf0e02bb032 (patch) | |
| tree | 539fdeba92e58818cb10849a19122679357181a1 /include | |
| parent | 3f7496aa72d3411579f996eb3998d1441906e99d (diff) | |
| parent | 125372faa4feb15e86f410c1adabbca9186d9c4a (diff) | |
| download | cachepc-linux-b8223bd1c49423a39a7da7e73cad8bf0e02bb032.tar.gz cachepc-linux-b8223bd1c49423a39a7da7e73cad8bf0e02bb032.zip | |
Merge branch 'gre-teb'
Jiri Benc says:
====================
gre: receive also TEB packets for lwtunnels
NOTE: this patchset needs net merged to net-next.
This allows lwtunnel users to get also packets with ETH_P_TEB protocol
specified in GRE header through an ipgre interface. There's really nothing
special about these packets in the case of lwtunnels - it's just an inner
protocol like any other. The only complications stem from keeping
compatibility with other uses of GRE.
This will be used by openvswitch to support eth_push and eth_pop actions.
I'd also like to see tc support for lwtunnels (this feature included) in the
future.
The first patch is not directly related and can be submitted standalone if
needed.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ip_tunnels.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index 6d790910ebdf..d916b4315903 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h @@ -160,6 +160,7 @@ struct tnl_ptk_info { #define PACKET_RCVD 0 #define PACKET_REJECT 1 +#define PACKET_NEXT 2 #define IP_TNL_HASH_BITS 7 #define IP_TNL_HASH_SIZE (1 << IP_TNL_HASH_BITS) |