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 /drivers/net/ethernet/natsemi/ns83820.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 'drivers/net/ethernet/natsemi/ns83820.c')
-rw-r--r-- | drivers/net/ethernet/natsemi/ns83820.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c index 2552e550a78c..eb807b0dc72a 100644 --- a/drivers/net/ethernet/natsemi/ns83820.c +++ b/drivers/net/ethernet/natsemi/ns83820.c | |||
@@ -1122,12 +1122,12 @@ again: | |||
1122 | } | 1122 | } |
1123 | 1123 | ||
1124 | #ifdef NS83820_VLAN_ACCEL_SUPPORT | 1124 | #ifdef NS83820_VLAN_ACCEL_SUPPORT |
1125 | if(vlan_tx_tag_present(skb)) { | 1125 | if (skb_vlan_tag_present(skb)) { |
1126 | /* fetch the vlan tag info out of the | 1126 | /* fetch the vlan tag info out of the |
1127 | * ancillary data if the vlan code | 1127 | * ancillary data if the vlan code |
1128 | * is using hw vlan acceleration | 1128 | * is using hw vlan acceleration |
1129 | */ | 1129 | */ |
1130 | short tag = vlan_tx_tag_get(skb); | 1130 | short tag = skb_vlan_tag_get(skb); |
1131 | extsts |= (EXTSTS_VPKT | htons(tag)); | 1131 | extsts |= (EXTSTS_VPKT | htons(tag)); |
1132 | } | 1132 | } |
1133 | #endif | 1133 | #endif |