linux-samsung-coreprimevelte: upgrade to v6.7-rc7 (MR 4600)
Also add a patch to fix NCM. [ci:skip-build] already built successfully in CI
This commit is contained in:
parent
e5c26d38f8
commit
189186cc69
3 changed files with 47 additions and 5 deletions
|
@ -0,0 +1,40 @@
|
|||
From 98a20243fbdd1facc9ba37167512ff02a786795f Mon Sep 17 00:00:00 2001
|
||||
From: Richard Acayan <mailingradian@gmail.com>
|
||||
Date: Mon, 18 Dec 2023 11:45:33 -0500
|
||||
Subject: [PATCH] usb: gadget: u_ether: Re-attach netif device to mirror
|
||||
detachment
|
||||
|
||||
In 6.7-rc1, there was a netif_device_detach call added to the
|
||||
gether_disconnect function. This clears the __LINK_STATE_PRESENT bit of
|
||||
the netif device and suppresses pings (ICMP messages) and TCP connection
|
||||
requests from the connected host. If userspace temporarily disconnects
|
||||
the gadget, such as by temporarily removing configuration in the gadget
|
||||
configfs interface, network activity should continue to be processed
|
||||
when the gadget is re-connected. Mirror the netif_device_detach call
|
||||
with a netif_device_attach call in gether_connect to fix re-connecting
|
||||
gadgets.
|
||||
|
||||
Link: https://gitlab.com/postmarketOS/pmaports/-/tree/6002e51b7090aeeb42947e0ca7ec22278d7227d0/main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
|
||||
Fixes: f49449fbc21e ("usb: gadget: u_ether: Replace netif_stop_queue with netif_device_detach")
|
||||
Signed-off-by: Richard Acayan <mailingradian@gmail.com>
|
||||
Tested-by: Luca Weiss <luca@z3ntu.xyz>
|
||||
---
|
||||
drivers/usb/gadget/function/u_ether.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
|
||||
index 9d1c40c152d8..3c5a6f6ac341 100644
|
||||
--- a/drivers/usb/gadget/function/u_ether.c
|
||||
+++ b/drivers/usb/gadget/function/u_ether.c
|
||||
@@ -1163,6 +1163,8 @@ struct net_device *gether_connect(struct gether *link)
|
||||
if (netif_running(dev->net))
|
||||
eth_start(dev, GFP_ATOMIC);
|
||||
|
||||
+ netif_device_attach(dev->net);
|
||||
+
|
||||
/* on error, disable any endpoints */
|
||||
} else {
|
||||
(void) usb_ep_disable(link->out_ep);
|
||||
--
|
||||
2.43.0
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
_flavor=samsung-coreprimevelte
|
||||
pkgname=linux-$_flavor
|
||||
pkgver=6.7_rc6
|
||||
pkgver=6.7_rc7
|
||||
pkgrel=0
|
||||
pkgdesc="Samsung Galaxy Core Prime VE LTE mainline kernel"
|
||||
arch="aarch64"
|
||||
_carch="arm64"
|
||||
url="https://gitlab.com/LegoLivesMatter/linux"
|
||||
_commit="fcbf65a4f68cab65de26bc95613785b93996db22"
|
||||
_commit="5bfc28c48fcdfecfacdbfb9d2d761b38cf85615f"
|
||||
license="GPL-2.0-only"
|
||||
options="!strip !check !tracedeps pmb:cross-native pmb:kconfigcheck-nftables
|
||||
pmb:kconfigcheck-zram"
|
||||
|
@ -20,6 +20,7 @@ _config="config-$_flavor.$arch"
|
|||
source="
|
||||
$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/linux-$_commit.tar.gz
|
||||
$_config
|
||||
0001-usb-gadget-u_ether-Re-attach-netif-device-to-mirror-.patch
|
||||
"
|
||||
builddir="$srcdir/linux-$_commit"
|
||||
|
||||
|
@ -52,6 +53,7 @@ package() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
5bd87f6b9582cebae24316b9ee1a62e837aaa6d342a2833b35ba6fda83f8e0519a673a8879cff171eaef76c52948ee19a4286b2badb33412b6b312be7ff67a15 linux-samsung-coreprimevelte-fcbf65a4f68cab65de26bc95613785b93996db22.tar.gz
|
||||
caa4d561713c6b1df96774aa77bae713fdc9b7a2b87272fd37b55ef1046b932fc7a9edb3b2045562741101f8b785e50e004aba01c6f26c7a375722184f2ab018 config-samsung-coreprimevelte.aarch64
|
||||
5ef16167232dac0d9e734d21a9cd504369976b129b5c5d441aec91aab506804ce5fe130fe678bf56c0849a4f4196a4aa15887d27ac71eb0ec76bf7f375442201 linux-samsung-coreprimevelte-5bfc28c48fcdfecfacdbfb9d2d761b38cf85615f.tar.gz
|
||||
3668fc46659991df20cfe2eae2d22ecc376388b1f5a38ac184be7bc55ca3fee042241ef8094758dfd897c91b491a500f67ee1135a63bc42f44fbd12e725dbf02 config-samsung-coreprimevelte.aarch64
|
||||
e56eed6e0cd447539479c12f2227ebd9e4a4c2ded055a81595e6fe5f6545b55b05c0a3790f45e4ee1354b7f79a0eddef0434bebd612f1ba8c230ea44001c84a4 0001-usb-gadget-u_ether-Re-attach-netif-device-to-mirror-.patch
|
||||
"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 6.7.0-rc6 Kernel Configuration
|
||||
# Linux/arm64 6.7.0-rc7 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
|
|
Loading…
Reference in a new issue