Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
Arne Fitzenreiter
2024-06-04 14:15:20 +02:00
2 changed files with 20 additions and 0 deletions

View File

@@ -133,6 +133,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# https://bugzilla.ipfire.org/show_bug.cgi?id=12760
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15-NFQUEUE-Hold-RCU-read-lock-while-calling-nf_reinject.patch
# reset ax88179 twice like in older kernels
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.6.32-asix88179_reset.patch
# Fix external module compile
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.0-fix_external_module_build.patch

View File

@@ -0,0 +1,17 @@
diff -Naur linux-6.6.32.org/drivers/net/usb/ax88179_178a.c linux-6.6.32/drivers/net/usb/ax88179_178a.c
--- linux-6.6.32.org/drivers/net/usb/ax88179_178a.c 2024-05-25 16:22:56.000000000 +0200
+++ linux-6.6.32/drivers/net/usb/ax88179_178a.c 2024-06-04 10:45:18.113453100 +0200
@@ -1678,10 +1678,10 @@
{
struct ax88179_data *ax179_data = dev->driver_priv;
- if (ax179_data->initialized)
+// if (ax179_data->initialized)
ax88179_reset(dev);
- else
- ax179_data->initialized = 1;
+// else
+// ax179_data->initialized = 1;
return 0;
}