Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4315d834c1496ddca977e9e22002b77c85bfec2c

Authored by Tom Herbert
Committed by David S. Miller
1 parent a131d82266
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

net: Fix rxq ref counting 

The rx->count reference is used to track reference counts to the
number of rx-queue kobjects created for the device.  This patch
eliminates initialization of the counter in netif_alloc_rx_queues
and instead increments the counter each time a kobject is created.
This is now symmetric with the decrement that is done when an object is
released.

Signed-off-by: Tom Herbert <therbert@google.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 2 additions and 1 deletions Side-by-side Diff

... ... @@ -5024,7 +5024,6 @@
5024 5024 return -ENOMEM;
5025 5025 }
5026 5026 dev->_rx = rx;
5027   - atomic_set(&rx->count, count);
5028 5027  
5029 5028 /*
5030 5029 * Set a pointer to first element in the array which holds the
net/core/net-sysfs.c
Diff comments   View file @ 4315d83
... ... @@ -726,6 +726,7 @@
726 726 static int rx_queue_add_kobject(struct net_device *net, int index)
727 727 {
728 728 struct netdev_rx_queue *queue = net->_rx + index;
  729 + struct netdev_rx_queue *first = queue->first;
729 730 struct kobject *kobj = &queue->kobj;
730 731 int error = 0;
731 732  
... ... @@ -738,6 +739,7 @@
738 739 }
739 740  
740 741 kobject_uevent(kobj, KOBJ_ADD);
  742 + atomic_inc(&first->count);
741 743  
742 744 return error;
743 745 }