Skip to content

Commit

Permalink
Merge branch 'br-next-fixes'
Browse files Browse the repository at this point in the history
Vladimir Oltean says:

====================
Fix buggy brport flags offload for SJA1105 DSA

While testing the "Software fallback for bridging in DSA" on sja1105, I
discovered that I managed to introduce two bugs in a single patch
submitted recently to net-next.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Feb 15, 2021
2 parents 1f778d5 + c97f47e commit ca04422
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion include/net/switchdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,8 @@ static inline void switchdev_deferred_process(void)
}

static inline int switchdev_port_attr_set(struct net_device *dev,
const struct switchdev_attr *attr)
const struct switchdev_attr *attr,
struct netlink_ext_ack *extack)
{
return -EOPNOTSUPP;
}
Expand Down
3 changes: 2 additions & 1 deletion net/bridge/br_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -1265,7 +1265,8 @@ static inline u16 br_get_pvid(const struct net_bridge_vlan_group *vg)
}

static inline int br_vlan_filter_toggle(struct net_bridge *br,
unsigned long val)
unsigned long val,
struct netlink_ext_ack *extack)
{
return -EOPNOTSUPP;
}
Expand Down

0 comments on commit ca04422

Please sign in to comment.