diff options
| author | David S. Miller <[email protected]> | 2021-02-15 13:15:10 -0800 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2021-02-15 13:15:10 -0800 |
| commit | ca04422afd6998611a81d0ea1b61d5a5f4923f84 (patch) | |
| tree | 5d47c91c0993b3e8ef032618759e4c0bc392026c | |
| parent | 1f778d500df3c0032a8ee1cd868ba60bd501b26b (diff) | |
| parent | c97f47e3c198bf442ef63abdccc48f7c5f85945f (diff) | |
Merge branch 'br-next-fixes'
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 <[email protected]>
| -rw-r--r-- | include/net/switchdev.h | 3 | ||||
| -rw-r--r-- | net/bridge/br_private.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/net/switchdev.h b/include/net/switchdev.h index 195f62672cc4..9a5426b61ca5 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -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; } diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index da71e71fcddc..d7d167e10b70 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -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; } |