Commit ca04422a authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 1f778d50 c97f47e3

include/net/switchdev.h

+2 −1
Original line number Diff line number Diff line
@@ -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;

}

net/bridge/br_private.h

+2 −1
Original line number Diff line number Diff line
@@ -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;

}