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

Commit 52aec126 authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

r8152: rename rx_buf_sz 



The variable "rx_buf_sz" is used by both tx and rx buffers. Replace
it with "agg_buf_sz".

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

drivers/net/usb/r8152.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -607,9 +607,9 @@ enum tx_csum_stat { 
 * 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;

static unsigned int rx_buf_sz = 16384;

static unsigned int agg_buf_sz = 16384;





#define RTL_LIMITED_TSO_SIZE	(rx_buf_sz - sizeof(struct tx_desc) - \

#define RTL_LIMITED_TSO_SIZE	(agg_buf_sz - sizeof(struct tx_desc) - \

				 VLAN_ETH_HLEN - VLAN_HLEN)

				 VLAN_ETH_HLEN - VLAN_HLEN)





static

static
@@ -1248,13 +1248,13 @@ static int alloc_all_mem(struct r8152 *tp) 
	skb_queue_head_init(&tp->tx_queue);

	skb_queue_head_init(&tp->tx_queue);





	for (i = 0; i < RTL8152_MAX_RX; i++) {

	for (i = 0; i < RTL8152_MAX_RX; i++) {

		buf = kmalloc_node(rx_buf_sz, GFP_KERNEL, node);

		buf = kmalloc_node(agg_buf_sz, GFP_KERNEL, node);

		if (!buf)

		if (!buf)

			goto err1;

			goto err1;





		if (buf != rx_agg_align(buf)) {

		if (buf != rx_agg_align(buf)) {

			kfree(buf);

			kfree(buf);

			buf = kmalloc_node(rx_buf_sz + RX_ALIGN, GFP_KERNEL,

			buf = kmalloc_node(agg_buf_sz + RX_ALIGN, GFP_KERNEL,

					   node);

					   node);

			if (!buf)

			if (!buf)

				goto err1;

				goto err1;
@@ -1274,13 +1274,13 @@ static int alloc_all_mem(struct r8152 *tp) 
	}

	}





	for (i = 0; i < RTL8152_MAX_TX; i++) {

	for (i = 0; i < RTL8152_MAX_TX; i++) {

		buf = kmalloc_node(rx_buf_sz, GFP_KERNEL, node);

		buf = kmalloc_node(agg_buf_sz, GFP_KERNEL, node);

		if (!buf)

		if (!buf)

			goto err1;

			goto err1;





		if (buf != tx_agg_align(buf)) {

		if (buf != tx_agg_align(buf)) {

			kfree(buf);

			kfree(buf);

			buf = kmalloc_node(rx_buf_sz + TX_ALIGN, GFP_KERNEL,

			buf = kmalloc_node(agg_buf_sz + TX_ALIGN, GFP_KERNEL,

					   node);

					   node);

			if (!buf)

			if (!buf)

				goto err1;

				goto err1;
@@ -1518,7 +1518,7 @@ static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg) 
	tx_data = agg->head;

	tx_data = agg->head;

	agg->skb_num = 0;

	agg->skb_num = 0;

	agg->skb_len = 0;

	agg->skb_len = 0;

	remain = rx_buf_sz;

	remain = agg_buf_sz;





	while (remain >= ETH_ZLEN + sizeof(struct tx_desc)) {

	while (remain >= ETH_ZLEN + sizeof(struct tx_desc)) {

		struct tx_desc *tx_desc;

		struct tx_desc *tx_desc;
@@ -1565,7 +1565,7 @@ static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg) 




		dev_kfree_skb_any(skb);

		dev_kfree_skb_any(skb);





		remain = rx_buf_sz - (int)(tx_agg_align(tx_data) - agg->head);

		remain = agg_buf_sz - (int)(tx_agg_align(tx_data) - agg->head);

	}

	}





	if (!skb_queue_empty(&skb_head)) {

	if (!skb_queue_empty(&skb_head)) {
@@ -1771,7 +1771,7 @@ static 
int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags)

int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags)

{

{

	usb_fill_bulk_urb(agg->urb, tp->udev, usb_rcvbulkpipe(tp->udev, 1),

	usb_fill_bulk_urb(agg->urb, tp->udev, usb_rcvbulkpipe(tp->udev, 1),

			  agg->head, rx_buf_sz,

			  agg->head, agg_buf_sz,

			  (usb_complete_t)read_bulk_callback, agg);

			  (usb_complete_t)read_bulk_callback, agg);





	return usb_submit_urb(agg->urb, mem_flags);

	return usb_submit_urb(agg->urb, mem_flags);
@@ -1915,7 +1915,7 @@ static void set_tx_qlen(struct r8152 *tp) 
{

{

	struct net_device *netdev = tp->netdev;

	struct net_device *netdev = tp->netdev;





	tp->tx_qlen = rx_buf_sz / (netdev->mtu + VLAN_ETH_HLEN + VLAN_HLEN +

	tp->tx_qlen = agg_buf_sz / (netdev->mtu + VLAN_ETH_HLEN + VLAN_HLEN +

				    sizeof(struct tx_desc));

				    sizeof(struct tx_desc));

}

}