On Mon, Jul 19, 2021 at 12:44:30AM +0300, Vladimir Oltean wrote:
quoted hunk ↗ jump to hunk
static int nbp_switchdev_add(struct net_bridge_port *p,
struct netdev_phys_item_id ppid,
+ bool tx_fwd_offload,
struct netlink_ext_ack *extack)
{
+ int err;
+
if (p->offload_count) {
/* Prevent unsupported configurations such as a bridge port
* which is a bonding interface, and the member ports are from@@ -189,7 +228,16 @@ static int nbp_switchdev_add(struct net_bridge_port *p,
p->ppid = ppid;
p->offload_count = 1;
- return nbp_switchdev_hwdom_set(p);
+ err = nbp_switchdev_hwdom_set(p);
+ if (err)
+ return err;
+
+ if (tx_fwd_offload) {
+ p->flags |= BR_TX_FWD_OFFLOAD;
+ static_branch_inc(&br_switchdev_fwd_offload_used);
+ }
+
+ return 0;
}
static void nbp_switchdev_del(struct net_bridge_port *p,@@ -210,6 +258,8 @@ static void nbp_switchdev_del(struct net_bridge_port *p,
if (p->hwdom)
nbp_switchdev_hwdom_put(p);
+
+ p->flags &= ~BR_TX_FWD_OFFLOAD;
}
Not the end of the world, but the static_branch_dec(&br_switchdev_fwd_offload_used)
was lost here in a rebase. Not a functional issue per se, but it is on
my list of things I would like to fix when I resend.