Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1a436c3 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: make tx ring map and free functionality non-static 



This change makes a minor change to the xmit_frame_ring_adv funcition in that
it moves 2 checks from it into the xmit_frame_adv since the checks were not
ring specific.  In addition it exports the xmit_frame_ring_adv and the
unmap_and_free_tx_resource calls so that they can be used by other code such
as the ethtool loopback testing calls.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7ee5b3a

drivers/net/igb/igb.h

+3 −0
Original line number Diff line number Diff line
@@ -349,6 +349,9 @@ extern void igb_configure_tx_ring(struct igb_adapter *, struct igb_ring *); 
extern void igb_configure_rx_ring(struct igb_adapter *, struct igb_ring *);

extern void igb_setup_tctl(struct igb_adapter *);

extern void igb_setup_rctl(struct igb_adapter *);

extern netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *, struct igb_ring *);

extern void igb_unmap_and_free_tx_resource(struct igb_ring *,

					   struct igb_buffer *);

extern void igb_alloc_rx_buffers_adv(struct igb_ring *, int);

extern void igb_update_stats(struct igb_adapter *);

extern void igb_set_ethtool_ops(struct net_device *);

drivers/net/igb/igb_main.c

+16 −19
Original line number Diff line number Diff line
@@ -99,10 +99,7 @@ static void igb_set_rx_mode(struct net_device *); 
static void igb_update_phy_info(unsigned long);

static void igb_watchdog(unsigned long);

static void igb_watchdog_task(struct work_struct *);

static netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *,

					   struct igb_ring *);

static netdev_tx_t igb_xmit_frame_adv(struct sk_buff *skb,

				      struct net_device *);

static netdev_tx_t igb_xmit_frame_adv(struct sk_buff *skb, struct net_device *);

static struct net_device_stats *igb_get_stats(struct net_device *);

static int igb_change_mtu(struct net_device *, int);

static int igb_set_mac(struct net_device *, void *);
@@ -2521,7 +2518,7 @@ static void igb_free_all_tx_resources(struct igb_adapter *adapter) 
		igb_free_tx_resources(&adapter->tx_ring[i]);

}



static void igb_unmap_and_free_tx_resource(struct igb_ring *tx_ring,

void igb_unmap_and_free_tx_resource(struct igb_ring *tx_ring,

				    struct igb_buffer *buffer_info)

{

	buffer_info->dma = 0;
@@ -3585,7 +3582,7 @@ static int igb_maybe_stop_tx(struct igb_ring *tx_ring, int size) 
	return __igb_maybe_stop_tx(tx_ring, size);

}



static netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb,

netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb,

				    struct igb_ring *tx_ring)

{

	struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
@@ -3596,16 +3593,6 @@ static netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb, 
	int tso = 0;

	union skb_shared_tx *shtx;



	if (test_bit(__IGB_DOWN, &adapter->state)) {

		dev_kfree_skb_any(skb);

		return NETDEV_TX_OK;

	}



	if (skb->len <= 0) {

		dev_kfree_skb_any(skb);

		return NETDEV_TX_OK;

	}



	/* need: 1 descriptor per page,

	 *       + 2 desc gap to keep tail from touching head,

	 *       + 1 desc for skb->data,
@@ -3680,8 +3667,18 @@ static netdev_tx_t igb_xmit_frame_adv(struct sk_buff *skb, 
{

	struct igb_adapter *adapter = netdev_priv(netdev);

	struct igb_ring *tx_ring;



	int r_idx = 0;



	if (test_bit(__IGB_DOWN, &adapter->state)) {

		dev_kfree_skb_any(skb);

		return NETDEV_TX_OK;

	}



	if (skb->len <= 0) {

		dev_kfree_skb_any(skb);

		return NETDEV_TX_OK;

	}



	r_idx = skb->queue_mapping & (IGB_ABS_MAX_TX_QUEUES - 1);

	tx_ring = adapter->multi_tx_table[r_idx];