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

Commit 0c3121fc authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

r8152: up the priority of the transmission 



move the tx_bottom() from delayed_work to tasklet. It makes the rx
and tx balanced. If the device is in runtime suspend when getting
the tx packet, wakeup the device before trasmitting.

Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 21949ab7

drivers/net/usb/r8152.c

+27 −18
Original line number Original line Diff line number Diff line
@@ -447,6 +447,7 @@ enum rtl8152_flags { 
	RTL8152_LINK_CHG,

	RTL8152_LINK_CHG,

	SELECTIVE_SUSPEND,

	SELECTIVE_SUSPEND,

	PHY_RESET,

	PHY_RESET,

	SCHEDULE_TASKLET,

};

};





/* Define these values to match your device */

/* Define these values to match your device */
@@ -1071,7 +1072,7 @@ static void write_bulk_callback(struct urb *urb) 
		return;

		return;





	if (!skb_queue_empty(&tp->tx_queue))

	if (!skb_queue_empty(&tp->tx_queue))

		schedule_delayed_work(&tp->schedule, 0);

		tasklet_schedule(&tp->tl);

}

}





static void intr_callback(struct urb *urb)

static void intr_callback(struct urb *urb)
@@ -1335,9 +1336,9 @@ static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg) 
	u8 *tx_data;

	u8 *tx_data;





	__skb_queue_head_init(&skb_head);

	__skb_queue_head_init(&skb_head);

	spin_lock_bh(&tx_queue->lock);

	spin_lock(&tx_queue->lock);

	skb_queue_splice_init(tx_queue, &skb_head);

	skb_queue_splice_init(tx_queue, &skb_head);

	spin_unlock_bh(&tx_queue->lock);

	spin_unlock(&tx_queue->lock);





	tx_data = agg->head;

	tx_data = agg->head;

	agg->skb_num = agg->skb_len = 0;

	agg->skb_num = agg->skb_len = 0;
@@ -1374,20 +1375,20 @@ static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg) 
	}

	}





	if (!skb_queue_empty(&skb_head)) {

	if (!skb_queue_empty(&skb_head)) {

		spin_lock_bh(&tx_queue->lock);

		spin_lock(&tx_queue->lock);

		skb_queue_splice(&skb_head, tx_queue);

		skb_queue_splice(&skb_head, tx_queue);

		spin_unlock_bh(&tx_queue->lock);

		spin_unlock(&tx_queue->lock);

	}

	}





	netif_tx_lock_bh(tp->netdev);

	netif_tx_lock(tp->netdev);





	if (netif_queue_stopped(tp->netdev) &&

	if (netif_queue_stopped(tp->netdev) &&

	    skb_queue_len(&tp->tx_queue) < tp->tx_qlen)

	    skb_queue_len(&tp->tx_queue) < tp->tx_qlen)

		netif_wake_queue(tp->netdev);

		netif_wake_queue(tp->netdev);





	netif_tx_unlock_bh(tp->netdev);

	netif_tx_unlock(tp->netdev);





	ret = usb_autopm_get_interface(tp->intf);

	ret = usb_autopm_get_interface_async(tp->intf);

	if (ret < 0)

	if (ret < 0)

		goto out_tx_fill;

		goto out_tx_fill;
@@ -1395,9 +1396,9 @@ static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg) 
			  agg->head, (int)(tx_data - (u8 *)agg->head),

			  agg->head, (int)(tx_data - (u8 *)agg->head),

			  (usb_complete_t)write_bulk_callback, agg);

			  (usb_complete_t)write_bulk_callback, agg);





	ret = usb_submit_urb(agg->urb, GFP_KERNEL);

	ret = usb_submit_urb(agg->urb, GFP_ATOMIC);

	if (ret < 0)

	if (ret < 0)

		usb_autopm_put_interface(tp->intf);

		usb_autopm_put_interface_async(tp->intf);





out_tx_fill:

out_tx_fill:

	return ret;

	return ret;
@@ -1535,6 +1536,7 @@ static void bottom_half(unsigned long data) 
		return;

		return;





	rx_bottom(tp);

	rx_bottom(tp);

	tx_bottom(tp);

}

}





static

static
@@ -1638,12 +1640,16 @@ static netdev_tx_t rtl8152_start_xmit(struct sk_buff *skb, 




	skb_queue_tail(&tp->tx_queue, skb);

	skb_queue_tail(&tp->tx_queue, skb);





	if (list_empty(&tp->tx_free) &&

	if (!list_empty(&tp->tx_free)) {

	    skb_queue_len(&tp->tx_queue) > tp->tx_qlen)

		if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {

		netif_stop_queue(netdev);

			set_bit(SCHEDULE_TASKLET, &tp->flags);



	if (!list_empty(&tp->tx_free))

			schedule_delayed_work(&tp->schedule, 0);

			schedule_delayed_work(&tp->schedule, 0);

		} else {

			usb_mark_last_busy(tp->udev);

			tasklet_schedule(&tp->tl);

		}

	} else if (skb_queue_len(&tp->tx_queue) > tp->tx_qlen)

		netif_stop_queue(netdev);





	return NETDEV_TX_OK;

	return NETDEV_TX_OK;

}

}
@@ -2523,8 +2529,11 @@ static void rtl_work_func_t(struct work_struct *work) 
	if (test_bit(RTL8152_SET_RX_MODE, &tp->flags))

	if (test_bit(RTL8152_SET_RX_MODE, &tp->flags))

		_rtl8152_set_rx_mode(tp->netdev);

		_rtl8152_set_rx_mode(tp->netdev);





	if (tp->speed & LINK_STATUS)

	if (test_bit(SCHEDULE_TASKLET, &tp->flags) &&

		tx_bottom(tp);

	    (tp->speed & LINK_STATUS)) {

		clear_bit(SCHEDULE_TASKLET, &tp->flags);

		tasklet_schedule(&tp->tl);

	}





	if (test_bit(PHY_RESET, &tp->flags))

	if (test_bit(PHY_RESET, &tp->flags))

		rtl_phy_reset(tp);

		rtl_phy_reset(tp);