aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/geneve.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2015-01-13 11:13:44 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-13 17:51:08 -0500
commitdf8a39defad46b83694ea6dd868d332976d62cc0 (patch)
treefe19bca0c2788033d49686babfc7b3853fa13340 /net/ipv4/geneve.c
parentd8b9605d2697c48fb822c821c5751afbb4567003 (diff)
net: rename vlan_tx_* helpers since "tx" is misleading there
The same macros are used for rx as well. So rename it. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/geneve.c')
-rw-r--r--net/ipv4/geneve.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c
index 5b52046ec7a2..23744c7a9718 100644
--- a/net/ipv4/geneve.c
+++ b/net/ipv4/geneve.c
@@ -119,7 +119,7 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt,
119 119
120 min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len 120 min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len
121 + GENEVE_BASE_HLEN + opt_len + sizeof(struct iphdr) 121 + GENEVE_BASE_HLEN + opt_len + sizeof(struct iphdr)
122 + (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0); 122 + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0);
123 123
124 err = skb_cow_head(skb, min_headroom); 124 err = skb_cow_head(skb, min_headroom);
125 if (unlikely(err)) { 125 if (unlikely(err)) {