diff options
Diffstat (limited to 'drivers/net/atlx')
-rw-r--r-- | drivers/net/atlx/atl1.c | 2 | ||||
-rw-r--r-- | drivers/net/atlx/atl2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index b8c053f76878..dbd27b8e66bd 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
@@ -2408,7 +2408,7 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb, | |||
2408 | (u16) atomic_read(&tpd_ring->next_to_use)); | 2408 | (u16) atomic_read(&tpd_ring->next_to_use)); |
2409 | memset(ptpd, 0, sizeof(struct tx_packet_desc)); | 2409 | memset(ptpd, 0, sizeof(struct tx_packet_desc)); |
2410 | 2410 | ||
2411 | if (adapter->vlgrp && vlan_tx_tag_present(skb)) { | 2411 | if (vlan_tx_tag_present(skb)) { |
2412 | vlan_tag = vlan_tx_tag_get(skb); | 2412 | vlan_tag = vlan_tx_tag_get(skb); |
2413 | vlan_tag = (vlan_tag << 4) | (vlan_tag >> 13) | | 2413 | vlan_tag = (vlan_tag << 4) | (vlan_tag >> 13) | |
2414 | ((vlan_tag >> 9) & 0x8); | 2414 | ((vlan_tag >> 9) & 0x8); |
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index 29c0265ccc5d..35b14bec1207 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c | |||
@@ -870,7 +870,7 @@ static netdev_tx_t atl2_xmit_frame(struct sk_buff *skb, | |||
870 | offset = ((u32)(skb->len-copy_len + 3) & ~3); | 870 | offset = ((u32)(skb->len-copy_len + 3) & ~3); |
871 | } | 871 | } |
872 | #ifdef NETIF_F_HW_VLAN_TX | 872 | #ifdef NETIF_F_HW_VLAN_TX |
873 | if (adapter->vlgrp && vlan_tx_tag_present(skb)) { | 873 | if (vlan_tx_tag_present(skb)) { |
874 | u16 vlan_tag = vlan_tx_tag_get(skb); | 874 | u16 vlan_tag = vlan_tx_tag_get(skb); |
875 | vlan_tag = (vlan_tag << 4) | | 875 | vlan_tag = (vlan_tag << 4) | |
876 | (vlan_tag >> 13) | | 876 | (vlan_tag >> 13) | |