aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.10/600-bridge_offload.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-05-25 13:09:23 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-07 22:28:59 +0200
commit49f8a75031c8fb2efc4824166da75f1473cdab6b (patch)
tree8735a6f849807516e7c1cc015616d5c584491a3c /target/linux/generic/hack-5.10/600-bridge_offload.patch
parent3ce3de934c34b8d36012cb687b38e5bcff62f95d (diff)
downloadupstream-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/hack-5.10/600-bridge_offload.patch')
-rw-r--r--target/linux/generic/hack-5.10/600-bridge_offload.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-5.10/600-bridge_offload.patch b/target/linux/generic/hack-5.10/600-bridge_offload.patch
index 7e1b852bf3..b704c98dc8 100644
--- a/target/linux/generic/hack-5.10/600-bridge_offload.patch
+++ b/target/linux/generic/hack-5.10/600-bridge_offload.patch
@@ -154,7 +154,7 @@
static int
br_netif_receive_skb(struct net *net, struct sock *sk, struct sk_buff *skb)
-@@ -162,6 +163,7 @@ int br_handle_frame_finish(struct net *n
+@@ -169,6 +170,7 @@ int br_handle_frame_finish(struct net *n
dst->used = now;
br_forward(dst->dst, skb, local_rcv, false);
} else {
@@ -162,7 +162,7 @@
if (!mcast_hit)
br_flood(br, skb, pkt_type, local_rcv, false);
else
-@@ -280,6 +282,9 @@ static rx_handler_result_t br_handle_fra
+@@ -287,6 +289,9 @@ static rx_handler_result_t br_handle_fra
memset(skb->cb, 0, sizeof(struct br_input_skb_cb));
p = br_port_get_rcu(skb->dev);