diff options
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_txrx.c')
-rw-r--r-- | drivers/net/ethernet/intel/ice/ice_txrx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c index bd1b27dd29a4..a1dcde49eb99 100644 --- a/drivers/net/ethernet/intel/ice/ice_txrx.c +++ b/drivers/net/ethernet/intel/ice/ice_txrx.c | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <linux/prefetch.h> | 6 | #include <linux/prefetch.h> |
7 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
8 | #include "ice.h" | 8 | #include "ice.h" |
9 | #include "ice_dcb_lib.h" | ||
9 | 10 | ||
10 | #define ICE_RX_HDR_SIZE 256 | 11 | #define ICE_RX_HDR_SIZE 256 |
11 | 12 | ||
@@ -1798,7 +1799,7 @@ ice_tx_prepare_vlan_flags(struct ice_ring *tx_ring, struct ice_tx_buf *first) | |||
1798 | * to the encapsulated ethertype. | 1799 | * to the encapsulated ethertype. |
1799 | */ | 1800 | */ |
1800 | skb->protocol = vlan_get_protocol(skb); | 1801 | skb->protocol = vlan_get_protocol(skb); |
1801 | goto out; | 1802 | return 0; |
1802 | } | 1803 | } |
1803 | 1804 | ||
1804 | /* if we have a HW VLAN tag being added, default to the HW one */ | 1805 | /* if we have a HW VLAN tag being added, default to the HW one */ |
@@ -1820,8 +1821,7 @@ ice_tx_prepare_vlan_flags(struct ice_ring *tx_ring, struct ice_tx_buf *first) | |||
1820 | first->tx_flags |= ICE_TX_FLAGS_SW_VLAN; | 1821 | first->tx_flags |= ICE_TX_FLAGS_SW_VLAN; |
1821 | } | 1822 | } |
1822 | 1823 | ||
1823 | out: | 1824 | return ice_tx_prepare_vlan_flags_dcb(tx_ring, first); |
1824 | return 0; | ||
1825 | } | 1825 | } |
1826 | 1826 | ||
1827 | /** | 1827 | /** |