--- zzzz-none-000/linux-4.9.276/net/bridge/br_switchdev.c	2021-07-20 14:21:16.000000000 +0000
+++ falcon-5530-750/linux-4.9.276/net/bridge/br_switchdev.c	2023-04-05 08:19:02.000000000 +0000
@@ -53,5 +53,70 @@
 				  const struct sk_buff *skb)
 {
 	return !skb->offload_fwd_mark ||
-	       BR_INPUT_SKB_CB(skb)->offload_fwd_mark != p->offload_fwd_mark;
+	       BR_INPUT_SKB_CB(skb)->offload_fwd_mark != p->offload_fwd_mark ||
+	       (p->flags & BR_SOFTWARE_FWD);
+}
+
+/* Flags that can be offloaded to hardware */
+#define BR_PORT_FLAGS_HW_OFFLOAD (BR_LEARNING | BR_FLOOD |                \
+				  BR_MCAST_FLOOD | BR_MCAST_DEST_LOOKUP | \
+				  BR_MCAST_SRC_LOOKUP | BR_ISOLATED | \
+				  BR_HAIRPIN_MODE | BR_MULTICAST_TO_UNICAST | \
+				  BR_MCAST_FLOOD | BR_BCAST_FLOOD | \
+				  BR_SOFTWARE_FWD)
+
+int br_switchdev_set_port_flag(struct net_bridge_port *p,
+			       unsigned long flags,
+			       unsigned long mask)
+{
+	struct switchdev_attr attr = {
+		.orig_dev = p->dev,
+		.id = SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS,
+		.u.brport_flags = mask,
+	};
+	int err;
+
+	if (mask & ~BR_PORT_FLAGS_HW_OFFLOAD)
+		return 0;
+
+	err = switchdev_port_attr_set(p->dev, &attr);
+	if (err == -EOPNOTSUPP)
+		return 0;
+
+	if (err) {
+		br_warn(p->br, "bridge flag offload is not supported %u(%s)\n",
+			(unsigned int)p->port_no, p->dev->name);
+		return -EOPNOTSUPP;
+	}
+
+	attr.id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS;
+	attr.flags = SWITCHDEV_F_DEFER;
+	attr.u.brport_flags = flags;
+
+	err = switchdev_port_attr_set(p->dev, &attr);
+	if (err) {
+		br_warn(p->br, "error setting offload flag on port %u(%s)\n",
+			(unsigned int)p->port_no, p->dev->name);
+		return err;
+	}
+
+	return 0;
+}
+
+int nbp_switchdev_avm_flood_ratelimit_set(struct net_bridge *br,
+					  int val)
+{
+	struct switchdev_attr attr = {
+		.orig_dev = br->dev,
+		.id = SWITCHDEV_ATTR_ID_BRIDGE_AVM_FLOOD_RATELIMIT,
+		.flags = SWITCHDEV_F_SKIP_EOPNOTSUPP | SWITCHDEV_F_DEFER,
+		.u.avm_flood_ratelimit = val,
+	};
+	int err;
+
+	err = switchdev_port_attr_set(br->dev, &attr);
+	if (err && err != -EOPNOTSUPP)
+		return err;
+
+	return 0;
 }