diff options
| author | Pravin B Shelar | 2013-06-18 02:50:02 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-06-20 03:07:41 +0200 |
| commit | 3d7b46cd20e300bd6989fb1f43d46f1b9645816e (patch) | |
| tree | b8a063f8ecb7e380f0e1672a60815ff48c3f9b56 /net/ipv4/gre.c | |
| parent | ip_tunnels: extend iptunnel_xmit() (diff) | |
| download | kernel-qcow2-linux-3d7b46cd20e300bd6989fb1f43d46f1b9645816e.tar.gz kernel-qcow2-linux-3d7b46cd20e300bd6989fb1f43d46f1b9645816e.tar.xz kernel-qcow2-linux-3d7b46cd20e300bd6989fb1f43d46f1b9645816e.zip | |
ip_tunnel: push generic protocol handling to ip_tunnel module.
Process skb tunnel header before sending packet to protocol handler.
this allows code sharing between gre and ovs gre modules.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/gre.c')
| -rw-r--r-- | net/ipv4/gre.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/gre.c b/net/ipv4/gre.c index 5ecc9c49b4dc..ba4803e609b5 100644 --- a/net/ipv4/gre.c +++ b/net/ipv4/gre.c @@ -201,7 +201,8 @@ static int parse_gre_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, return -EINVAL; } } - return 0; + + return iptunnel_pull_header(skb, hdr_len, tpi->proto); } static int gre_cisco_rcv(struct sk_buff *skb) |