aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/602-v5.12-net-add-sysfs-attribute-to-control-napi-threaded-mod.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/backport-5.10/602-v5.12-net-add-sysfs-attribute-to-control-napi-threaded-mod.patch')
-rw-r--r--target/linux/generic/backport-5.10/602-v5.12-net-add-sysfs-attribute-to-control-napi-threaded-mod.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-5.10/602-v5.12-net-add-sysfs-attribute-to-control-napi-threaded-mod.patch b/target/linux/generic/backport-5.10/602-v5.12-net-add-sysfs-attribute-to-control-napi-threaded-mod.patch
index dfe8b68d4a..de1cd08df4 100644
--- a/target/linux/generic/backport-5.10/602-v5.12-net-add-sysfs-attribute-to-control-napi-threaded-mod.patch
+++ b/target/linux/generic/backport-5.10/602-v5.12-net-add-sysfs-attribute-to-control-napi-threaded-mod.patch
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
* @n: NAPI context
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -4287,8 +4287,9 @@ static inline void ____napi_schedule(str
+@@ -4290,8 +4290,9 @@ static inline void ____napi_schedule(str
if (test_bit(NAPI_STATE_THREADED, &napi->state)) {
/* Paired with smp_mb__before_atomic() in
@@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
* wake_up_process() when it's not NULL.
*/
thread = READ_ONCE(napi->thread);
-@@ -6762,6 +6763,49 @@ static void init_gro_hash(struct napi_st
+@@ -6765,6 +6766,49 @@ static void init_gro_hash(struct napi_st
napi->gro_bitmask = 0;
}
@@ -121,7 +121,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
{
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
-@@ -538,6 +538,45 @@ static ssize_t phys_switch_id_show(struc
+@@ -587,6 +587,45 @@ static ssize_t phys_switch_id_show(struc
}
static DEVICE_ATTR_RO(phys_switch_id);
@@ -167,7 +167,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static struct attribute *net_class_attrs[] __ro_after_init = {
&dev_attr_netdev_group.attr,
&dev_attr_type.attr,
-@@ -570,6 +609,7 @@ static struct attribute *net_class_attrs
+@@ -619,6 +658,7 @@ static struct attribute *net_class_attrs
&dev_attr_proto_down.attr,
&dev_attr_carrier_up_count.attr,
&dev_attr_carrier_down_count.attr,