diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-02-15 13:15:10 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-02-15 13:15:10 -0800 |
| commit | ca04422afd6998611a81d0ea1b61d5a5f4923f84 (patch) | |
| tree | 5d47c91c0993b3e8ef032618759e4c0bc392026c /include | |
| parent | net: mscc: ocelot: avoid type promotion when calling ocelot_ifh_set_dest (diff) | |
| parent | net: bridge: fix br_vlan_filter_toggle stub when CONFIG_BRIDGE_VLAN_FILTERING=n (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 <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/switchdev.h | 3 |
1 files changed, 2 insertions, 1 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; } |