aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/geneve.c
diff options
context:
space:
mode:
authorTom Herbert <therbert@google.com>2015-01-20 14:23:04 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-25 02:15:40 -0500
commitd998f8efa47221405ceae129aa93fa6d4ac8510d (patch)
treeacb9482e367cef876bbc4aac946fdde32ad25b51 /net/ipv4/geneve.c
parent2b995f63987013bacde99168218f9c7b252bdcf1 (diff)
udp: Do not require sock in udp_tunnel_xmit_skb
The UDP tunnel transmit functions udp_tunnel_xmit_skb and udp_tunnel6_xmit_skb include a socket argument. The socket being passed to the functions (from VXLAN) is a UDP created for receive side. The only thing that the socket is used for in the transmit functions is to get the setting for checksum (enabled or zero). This patch removes the argument and and adds a nocheck argument for checksum setting. This eliminates the unnecessary dependency on a UDP socket for UDP tunnel transmit. Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/geneve.c')
-rw-r--r--net/ipv4/geneve.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c
index 9568594ca2f1..93e51199e44b 100644
--- a/net/ipv4/geneve.c
+++ b/net/ipv4/geneve.c
@@ -136,8 +136,9 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt,
136 136
137 skb_set_inner_protocol(skb, htons(ETH_P_TEB)); 137 skb_set_inner_protocol(skb, htons(ETH_P_TEB));
138 138
139 return udp_tunnel_xmit_skb(gs->sock, rt, skb, src, dst, 139 return udp_tunnel_xmit_skb(rt, skb, src, dst,
140 tos, ttl, df, src_port, dst_port, xnet); 140 tos, ttl, df, src_port, dst_port, xnet,
141 gs->sock->sk->sk_no_check_tx);
141} 142}
142EXPORT_SYMBOL_GPL(geneve_xmit_skb); 143EXPORT_SYMBOL_GPL(geneve_xmit_skb);
143 144