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

Commit 76085c9e authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

r8169: replace macro TX_FRAGS_READY_FOR with a function 



Replace macro TX_FRAGS_READY_FOR with function rtl_tx_slots_avail
to make code cleaner and type-safe.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5317d5c6

drivers/net/ethernet/realtek/r8169.c

+13 −11
Original line number Original line Diff line number Diff line
@@ -56,13 +56,6 @@ 
#define R8169_MSG_DEFAULT \

#define R8169_MSG_DEFAULT \

	(NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN)

	(NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN)





#define TX_SLOTS_AVAIL(tp) \

	(tp->dirty_tx + NUM_TX_DESC - tp->cur_tx)



/* A skbuff with nr_frags needs nr_frags+1 entries in the tx queue */

#define TX_FRAGS_READY_FOR(tp,nr_frags) \

	(TX_SLOTS_AVAIL(tp) >= (nr_frags + 1))



/* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).

/* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).

   The RTL chips use a 64 element hash table based on the Ethernet CRC. */

   The RTL chips use a 64 element hash table based on the Ethernet CRC. */

static const int multicast_filter_limit = 32;

static const int multicast_filter_limit = 32;
@@ -6058,6 +6051,15 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp, 
	return true;

	return true;

}

}





static bool rtl_tx_slots_avail(struct rtl8169_private *tp,

			       unsigned int nr_frags)

{

	unsigned int slots_avail = tp->dirty_tx + NUM_TX_DESC - tp->cur_tx;



	/* A skbuff with nr_frags needs nr_frags+1 entries in the tx queue */

	return slots_avail > nr_frags;

}



static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,

static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,

				      struct net_device *dev)

				      struct net_device *dev)

{

{
@@ -6069,7 +6071,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, 
	u32 opts[2], len;

	u32 opts[2], len;

	int frags;

	int frags;





	if (unlikely(!TX_FRAGS_READY_FOR(tp, skb_shinfo(skb)->nr_frags))) {

	if (unlikely(!rtl_tx_slots_avail(tp, skb_shinfo(skb)->nr_frags))) {

		netif_err(tp, drv, dev, "BUG! Tx Ring full when queue awake!\n");

		netif_err(tp, drv, dev, "BUG! Tx Ring full when queue awake!\n");

		goto err_stop_0;

		goto err_stop_0;

	}

	}
@@ -6126,7 +6128,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, 




	mmiowb();

	mmiowb();





	if (!TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS)) {

	if (!rtl_tx_slots_avail(tp, MAX_SKB_FRAGS)) {

		/* Avoid wrongly optimistic queue wake-up: rtl_tx thread must

		/* Avoid wrongly optimistic queue wake-up: rtl_tx thread must

		 * not miss a ring update when it notices a stopped queue.

		 * not miss a ring update when it notices a stopped queue.

		 */

		 */
@@ -6140,7 +6142,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, 
		 * can't.

		 * can't.

		 */

		 */

		smp_mb();

		smp_mb();

		if (TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS))

		if (rtl_tx_slots_avail(tp, MAX_SKB_FRAGS))

			netif_wake_queue(dev);

			netif_wake_queue(dev);

	}

	}
@@ -6258,7 +6260,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, 
		 */

		 */

		smp_mb();

		smp_mb();

		if (netif_queue_stopped(dev) &&

		if (netif_queue_stopped(dev) &&

		    TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS)) {

		    rtl_tx_slots_avail(tp, MAX_SKB_FRAGS)) {

			netif_wake_queue(dev);

			netif_wake_queue(dev);

		}

		}

		/*

		/*