diff options
| author | John Audia <therealgraysky@proton.me> | 2022-05-25 13:09:23 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-07 22:28:59 +0200 |
| commit | 49f8a75031c8fb2efc4824166da75f1473cdab6b (patch) | |
| tree | 8735a6f849807516e7c1cc015616d5c584491a3c /target/linux/generic/pending-5.10/150-bridge_allow_receiption_on_disabled_port.patch | |
| parent | 3ce3de934c34b8d36012cb687b38e5bcff62f95d (diff) | |
| download | upstream-49f8a75031c8fb2efc4824166da75f1473cdab6b.tar.gz upstream-49f8a75031c8fb2efc4824166da75f1473cdab6b.tar.bz2 upstream-49f8a75031c8fb2efc4824166da75f1473cdab6b.zip | |
kernel: bump 5.10 to 5.10.118
Removed upstreamed:
generic-backport/774-v5.15-1-igc-remove-_I_PHY_ID-checking.patch
generic-backport/774-v5.15-2-igc-remove-phy-type-checking.patch
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit b789a588b1c55fe1df7e2d6ae1c4f84b96a03a95)
Diffstat (limited to 'target/linux/generic/pending-5.10/150-bridge_allow_receiption_on_disabled_port.patch')
| -rw-r--r-- | target/linux/generic/pending-5.10/150-bridge_allow_receiption_on_disabled_port.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.10/150-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/pending-5.10/150-bridge_allow_receiption_on_disabled_port.patch index 6de22b1c7d..8ab4b361f0 100644 --- a/target/linux/generic/pending-5.10/150-bridge_allow_receiption_on_disabled_port.patch +++ b/target/linux/generic/pending-5.10/150-bridge_allow_receiption_on_disabled_port.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -195,6 +195,9 @@ static void __br_handle_local_finish(str +@@ -202,6 +202,9 @@ static void __br_handle_local_finish(str /* note: already called with rcu_read_lock */ static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb) { @@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> __br_handle_local_finish(skb); /* return 1 to signal the okfn() was called so it's ok to use the skb */ -@@ -348,6 +351,17 @@ static rx_handler_result_t br_handle_fra +@@ -355,6 +358,17 @@ static rx_handler_result_t br_handle_fra forward: switch (p->state) { |