Commit 05ae8614 authored by Björn Töpel's avatar Björn Töpel Committed by Jeff Kirsher
Browse files

ixgbe: move common Tx functions to ixgbe_txrx_common.h 



This patch prepares for the upcoming zero-copy Tx functionality by
moving common functions used both by the regular path and zero-copy
path.

Signed-off-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Tested-by: default avatarWilliam Tu <u9012063@gmail.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d0bcacd0

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+3 −6
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ static void ixgbe_set_ivar(struct ixgbe_adapter *adapter, s8 direction, 
	}

}



static inline void ixgbe_irq_rearm_queues(struct ixgbe_adapter *adapter,

void ixgbe_irq_rearm_queues(struct ixgbe_adapter *adapter,

			    u64 qmask)

{

	u32 mask;
@@ -8154,9 +8154,6 @@ static inline int ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size) 
	return __ixgbe_maybe_stop_tx(tx_ring, size);

}



#define IXGBE_TXD_CMD (IXGBE_TXD_CMD_EOP | \

		       IXGBE_TXD_CMD_RS)



static int ixgbe_tx_map(struct ixgbe_ring *tx_ring,

			struct ixgbe_tx_buffer *first,

			const u8 hdr_len)
@@ -10257,7 +10254,7 @@ static int ixgbe_xdp(struct net_device *dev, struct netdev_bpf *xdp) 
	}

}



static void ixgbe_xdp_ring_update_tail(struct ixgbe_ring *ring)

void ixgbe_xdp_ring_update_tail(struct ixgbe_ring *ring)

{

	/* Force memory writes to complete before letting h/w know there

	 * are new descriptors to fetch.

drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
#define IXGBE_XDP_TX		BIT(1)

#define IXGBE_XDP_REDIR		BIT(2)



#define IXGBE_TXD_CMD (IXGBE_TXD_CMD_EOP | \

		       IXGBE_TXD_CMD_RS)



int ixgbe_xmit_xdp_ring(struct ixgbe_adapter *adapter,

			struct xdp_frame *xdpf);

bool ixgbe_cleanup_headers(struct ixgbe_ring *rx_ring,
@@ -19,6 +22,8 @@ void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring, 
			      struct sk_buff *skb);

void ixgbe_rx_skb(struct ixgbe_q_vector *q_vector,

		  struct sk_buff *skb);

void ixgbe_xdp_ring_update_tail(struct ixgbe_ring *ring);

void ixgbe_irq_rearm_queues(struct ixgbe_adapter *adapter, u64 qmask);



void ixgbe_txrx_ring_disable(struct ixgbe_adapter *adapter, int ring);

void ixgbe_txrx_ring_enable(struct ixgbe_adapter *adapter, int ring);

CRA Git | Maintained and supported by SUSTech CRA and CCSE