diff options
| author |   Pravin B Shelar <pshelar@nicira.com> | 2015-08-07 23:51:42 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-08-10 14:03:54 -0700 |
| commit | 2e15ea390e6f4466655066d97e22ec66870a042c (patch) | |
| tree | 68df68ac988e713a34b830bfabe05faaf0d55bf4 /net/ipv4/ipip.c | |
| parent | openvswitch: Move tunnel destroy function to oppenvswitch module. (diff) | |
| download | linux-dev-2e15ea390e6f4466655066d97e22ec66870a042c.tar.xz linux-dev-2e15ea390e6f4466655066d97e22ec66870a042c.zip | |
ip_gre: Add support to collect tunnel metadata.
Following patch create new tunnel flag which enable
tunnel metadata collection on given device.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipip.c')
| -rw-r--r-- | net/ipv4/ipip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 254238daf58b..f34c31defafe 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -198,7 +198,7 @@ static int ipip_rcv(struct sk_buff *skb) goto drop; if (iptunnel_pull_header(skb, 0, tpi.proto)) goto drop; - return ip_tunnel_rcv(tunnel, skb, &tpi, log_ecn_error); + return ip_tunnel_rcv(tunnel, skb, &tpi, NULL, log_ecn_error); } return -1; |