diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2022-10-18 23:43:43 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-22 22:28:15 +0200 |
| commit | 19a246bb6503942fe332c1f744d583e38aeca9c0 (patch) | |
| tree | ffd9ab410b7a131750086be4aaa843466ee117ac /target/linux/generic/hack-6.1/600-bridge_offload.patch | |
| parent | 92a0cc7c61d0d532449ccda0fbf2dc622ece17c5 (diff) | |
| download | upstream-19a246bb6503942fe332c1f744d583e38aeca9c0.tar.gz upstream-19a246bb6503942fe332c1f744d583e38aeca9c0.tar.bz2 upstream-19a246bb6503942fe332c1f744d583e38aeca9c0.zip | |
generic: 6.1: manually refresh hack patches
Refresh hack patches for kernel 6.1.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/hack-6.1/600-bridge_offload.patch')
| -rw-r--r-- | target/linux/generic/hack-6.1/600-bridge_offload.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/generic/hack-6.1/600-bridge_offload.patch b/target/linux/generic/hack-6.1/600-bridge_offload.patch index 9d71a741b25..6462044bbe3 100644 --- a/target/linux/generic/hack-6.1/600-bridge_offload.patch +++ b/target/linux/generic/hack-6.1/600-bridge_offload.patch @@ -26,10 +26,10 @@ Subject: [PATCH] net/bridge: add bridge offload --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -59,6 +59,7 @@ struct br_ip_list { - #define BR_MRP_LOST_IN_CONT BIT(19) #define BR_TX_FWD_OFFLOAD BIT(20) - #define BR_BPDU_FILTER BIT(21) -+#define BR_OFFLOAD BIT(22) + #define BR_PORT_LOCKED BIT(21) + #define BR_BPDU_FILTER BIT(22) ++#define BR_OFFLOAD BIT(23) #define BR_DEFAULT_AGEING_TIME (300 * HZ) @@ -103,16 +103,7 @@ Subject: [PATCH] net/bridge: add bridge offload static const struct rhashtable_params br_fdb_rht_params = { .head_offset = offsetof(struct net_bridge_fdb_entry, rhnode), -@@ -518,6 +519,8 @@ static struct net_bridge_fdb_entry *fdb_ - fdb->key.vlan_id = vid; - fdb->flags = flags; - fdb->updated = fdb->used = jiffies; -+ INIT_HLIST_HEAD(&fdb->offload_in); -+ INIT_HLIST_HEAD(&fdb->offload_out); - if (rhashtable_lookup_insert_fast(&br->fdb_hash_tbl, - &fdb->rhnode, - br_fdb_rht_params)) { -@@ -794,6 +797,8 @@ static void fdb_notify(struct net_bridge +@@ -185,6 +185,8 @@ static void fdb_notify(struct net_bridge struct sk_buff *skb; int err = -ENOBUFS; @@ -121,6 +112,15 @@ Subject: [PATCH] net/bridge: add bridge offload if (swdev_notify) br_switchdev_fdb_notify(br, fdb, type); +@@ -518,6 +519,8 @@ static struct net_bridge_fdb_entry *fdb_ + fdb->key.vlan_id = vid; + fdb->flags = flags; + fdb->updated = fdb->used = jiffies; ++ INIT_HLIST_HEAD(&fdb->offload_in); ++ INIT_HLIST_HEAD(&fdb->offload_out); + err = rhashtable_lookup_insert_fast(&br->fdb_hash_tbl, &fdb->rhnode, + br_fdb_rht_params); + if (err) { --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -16,6 +16,7 @@ |