Commit 19d62907 authored by Faizal Rahim's avatar Faizal Rahim Committed by Tony Nguyen
Browse files

igc: rename xdp_get_tx_ring() for non-xdp usage 



Renamed xdp_get_tx_ring() function to a more generic name for use in
upcoming frame preemption patches.

Signed-off-by: default avatarFaizal Rahim <faizal.abdul.rahim@linux.intel.com>
Tested-by: default avatarMor Bar-Gabay <morx.bar.gabay@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent dda66634

drivers/net/ethernet/intel/igc/igc.h

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ struct igc_nfc_rule *igc_get_nfc_rule(struct igc_adapter *adapter, 
				      u32 location);

int igc_add_nfc_rule(struct igc_adapter *adapter, struct igc_nfc_rule *rule);

void igc_del_nfc_rule(struct igc_adapter *adapter, struct igc_nfc_rule *rule);



struct igc_ring *igc_get_tx_ring(struct igc_adapter *adapter, int cpu);

void igc_ptp_init(struct igc_adapter *adapter);

void igc_ptp_reset(struct igc_adapter *adapter);

void igc_ptp_suspend(struct igc_adapter *adapter);

drivers/net/ethernet/intel/igc/igc_main.c

+4 −5
Original line number Diff line number Diff line
@@ -2464,8 +2464,7 @@ static int igc_xdp_init_tx_descriptor(struct igc_ring *ring, 
	return -ENOMEM;

}



static struct igc_ring *igc_xdp_get_tx_ring(struct igc_adapter *adapter,

					    int cpu)

struct igc_ring *igc_get_tx_ring(struct igc_adapter *adapter, int cpu)

{

	int index = cpu;
@@ -2489,7 +2488,7 @@ static int igc_xdp_xmit_back(struct igc_adapter *adapter, struct xdp_buff *xdp) 
	if (unlikely(!xdpf))

		return -EFAULT;



	ring = igc_xdp_get_tx_ring(adapter, cpu);

	ring = igc_get_tx_ring(adapter, cpu);

	nq = txring_txq(ring);



	__netif_tx_lock(nq, cpu);
@@ -2566,7 +2565,7 @@ static void igc_finalize_xdp(struct igc_adapter *adapter, int status) 
	struct igc_ring *ring;



	if (status & IGC_XDP_TX) {

		ring = igc_xdp_get_tx_ring(adapter, cpu);

		ring = igc_get_tx_ring(adapter, cpu);

		nq = txring_txq(ring);



		__netif_tx_lock(nq, cpu);
@@ -6779,7 +6778,7 @@ static int igc_xdp_xmit(struct net_device *dev, int num_frames, 
	if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK))

		return -EINVAL;



	ring = igc_xdp_get_tx_ring(adapter, cpu);

	ring = igc_get_tx_ring(adapter, cpu);

	nq = txring_txq(ring);



	__netif_tx_lock(nq, cpu);