diff options
author | Jiri Pirko <jiri@resnulli.us> | 2015-01-13 16:13:44 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-13 22:51:08 (GMT) |
commit | df8a39defad46b83694ea6dd868d332976d62cc0 (patch) | |
tree | fe19bca0c2788033d49686babfc7b3853fa13340 /net/core/netpoll.c | |
parent | d8b9605d2697c48fb822c821c5751afbb4567003 (diff) | |
download | linux-df8a39defad46b83694ea6dd868d332976d62cc0.tar.xz |
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/core/netpoll.c')
-rw-r--r-- | net/core/netpoll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index e0ad5d1..c126a87 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -77,7 +77,7 @@ static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev, features = netif_skb_features(skb); - if (vlan_tx_tag_present(skb) && + if (skb_vlan_tag_present(skb) && !vlan_hw_offload_capable(features, skb->vlan_proto)) { skb = __vlan_hwaccel_push_inside(skb); if (unlikely(!skb)) { |