aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c9
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h5
2 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index cad4c12e8e63..b7ee6d84d0c1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -895,8 +895,8 @@ static void ixgbe_set_ivar(struct ixgbe_adapter *adapter, s8 direction,
895 } 895 }
896} 896}
897 897
898static inline void ixgbe_irq_rearm_queues(struct ixgbe_adapter *adapter, 898void ixgbe_irq_rearm_queues(struct ixgbe_adapter *adapter,
899 u64 qmask) 899 u64 qmask)
900{ 900{
901 u32 mask; 901 u32 mask;
902 902
@@ -8154,9 +8154,6 @@ static inline int ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size)
8154 return __ixgbe_maybe_stop_tx(tx_ring, size); 8154 return __ixgbe_maybe_stop_tx(tx_ring, size);
8155} 8155}
8156 8156
8157#define IXGBE_TXD_CMD (IXGBE_TXD_CMD_EOP | \
8158 IXGBE_TXD_CMD_RS)
8159
8160static int ixgbe_tx_map(struct ixgbe_ring *tx_ring, 8157static int ixgbe_tx_map(struct ixgbe_ring *tx_ring,
8161 struct ixgbe_tx_buffer *first, 8158 struct ixgbe_tx_buffer *first,
8162 const u8 hdr_len) 8159 const u8 hdr_len)
@@ -10257,7 +10254,7 @@ static int ixgbe_xdp(struct net_device *dev, struct netdev_bpf *xdp)
10257 } 10254 }
10258} 10255}
10259 10256
10260static void ixgbe_xdp_ring_update_tail(struct ixgbe_ring *ring) 10257void ixgbe_xdp_ring_update_tail(struct ixgbe_ring *ring)
10261{ 10258{
10262 /* Force memory writes to complete before letting h/w know there 10259 /* Force memory writes to complete before letting h/w know there
10263 * are new descriptors to fetch. 10260 * are new descriptors to fetch.
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h
index cf219f4e009d..56afb685c648 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h
@@ -9,6 +9,9 @@
9#define IXGBE_XDP_TX BIT(1) 9#define IXGBE_XDP_TX BIT(1)
10#define IXGBE_XDP_REDIR BIT(2) 10#define IXGBE_XDP_REDIR BIT(2)
11 11
12#define IXGBE_TXD_CMD (IXGBE_TXD_CMD_EOP | \
13 IXGBE_TXD_CMD_RS)
14
12int ixgbe_xmit_xdp_ring(struct ixgbe_adapter *adapter, 15int ixgbe_xmit_xdp_ring(struct ixgbe_adapter *adapter,
13 struct xdp_frame *xdpf); 16 struct xdp_frame *xdpf);
14bool ixgbe_cleanup_headers(struct ixgbe_ring *rx_ring, 17bool ixgbe_cleanup_headers(struct ixgbe_ring *rx_ring,
@@ -19,6 +22,8 @@ void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
19 struct sk_buff *skb); 22 struct sk_buff *skb);
20void ixgbe_rx_skb(struct ixgbe_q_vector *q_vector, 23void ixgbe_rx_skb(struct ixgbe_q_vector *q_vector,
21 struct sk_buff *skb); 24 struct sk_buff *skb);
25void ixgbe_xdp_ring_update_tail(struct ixgbe_ring *ring);
26void ixgbe_irq_rearm_queues(struct ixgbe_adapter *adapter, u64 qmask);
22 27
23void ixgbe_txrx_ring_disable(struct ixgbe_adapter *adapter, int ring); 28void ixgbe_txrx_ring_disable(struct ixgbe_adapter *adapter, int ring);
24void ixgbe_txrx_ring_enable(struct ixgbe_adapter *adapter, int ring); 29void ixgbe_txrx_ring_enable(struct ixgbe_adapter *adapter, int ring);