diff options
author | Jiri Pirko <jiri@resnulli.us> | 2015-01-13 11:13:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-13 17:51:08 -0500 |
commit | df8a39defad46b83694ea6dd868d332976d62cc0 (patch) | |
tree | fe19bca0c2788033d49686babfc7b3853fa13340 /net/openvswitch/vport-gre.c | |
parent | d8b9605d2697c48fb822c821c5751afbb4567003 (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/openvswitch/vport-gre.c')
-rw-r--r-- | net/openvswitch/vport-gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c index d4168c442db5..e9aedb7c7106 100644 --- a/net/openvswitch/vport-gre.c +++ b/net/openvswitch/vport-gre.c | |||
@@ -166,7 +166,7 @@ static int gre_tnl_send(struct vport *vport, struct sk_buff *skb) | |||
166 | 166 | ||
167 | min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len | 167 | min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len |
168 | + tunnel_hlen + sizeof(struct iphdr) | 168 | + tunnel_hlen + sizeof(struct iphdr) |
169 | + (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0); | 169 | + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0); |
170 | if (skb_headroom(skb) < min_headroom || skb_header_cloned(skb)) { | 170 | if (skb_headroom(skb) < min_headroom || skb_header_cloned(skb)) { |
171 | int head_delta = SKB_DATA_ALIGN(min_headroom - | 171 | int head_delta = SKB_DATA_ALIGN(min_headroom - |
172 | skb_headroom(skb) + | 172 | skb_headroom(skb) + |