iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'br-next-fixes'

Browse Source 
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>
This commit is contained in:
David S. Miller 2021-02-15 13:15:10 -08:00
commit ca04422afd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/switchdev.h
View File

@ -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;
}

3
net/bridge/br_private.h
View File

@ -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;
}