diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-06 22:01:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-06 22:01:18 -0500 |
| commit | 4e84b496fd2a226883920e0e0de4ed3f94898adf (patch) | |
| tree | 662e314870fabf5d6e3bf25b955bd537eb72de54 /net/ipv4/geneve.c | |
| parent | 5c91ae08e4500ebc8efd584c8b87c4040d5393ea (diff) | |
| parent | 9d01412ae76fec5274a3d94a28a3552a742a60dc (diff) | |
| download | op-kernel-dev-4e84b496fd2a226883920e0e0de4ed3f94898adf.zip op-kernel-dev-4e84b496fd2a226883920e0e0de4ed3f94898adf.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv4/geneve.c')
| -rw-r--r-- | net/ipv4/geneve.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c index 91861fe..31802af 100644 --- a/net/ipv4/geneve.c +++ b/net/ipv4/geneve.c @@ -144,6 +144,8 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt, gnvh = (struct genevehdr *)__skb_push(skb, sizeof(*gnvh) + opt_len); geneve_build_header(gnvh, tun_flags, vni, opt_len, opt); + skb_set_inner_protocol(skb, htons(ETH_P_TEB)); + return udp_tunnel_xmit_skb(gs->sock, rt, skb, src, dst, tos, ttl, df, src_port, dst_port, xnet); } @@ -364,6 +366,7 @@ late_initcall(geneve_init_module); static void __exit geneve_cleanup_module(void) { destroy_workqueue(geneve_wq); + unregister_pernet_subsys(&geneve_net_ops); } module_exit(geneve_cleanup_module); |
