diff mbox series

[net-next,2/2] net: bridge: fix br_vlan_filter_toggle stub when CONFIG_BRIDGE_VLAN_FILTERING=n

Message ID 20210215210912.2633895-3-olteanv@gmail.com (mailing list archive)
State Accepted
Commit c97f47e3c198bf442ef63abdccc48f7c5f85945f
Delegated to: Netdev Maintainers
Headers show
Series Fixing build breakage after "Merge branch 'Propagate-extack-for-switchdev-LANs-from-DSA'" | expand

Checks

Context Check Description
netdev/cover_letter success Link
netdev/fixes_present success Link
netdev/patch_count success Link
netdev/tree_selection success Clearly marked for net-next
netdev/subject_prefix success Link
netdev/cc_maintainers fail 2 blamed authors not CCed: vladimir.oltean@nxp.com f.fainelli@gmail.com; 3 maintainers not CCed: vladimir.oltean@nxp.com bridge@lists.linux-foundation.org f.fainelli@gmail.com
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Link
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 4 this patch: 4
netdev/kdoc success Errors and warnings before: 3 this patch: 3
netdev/verify_fixes success Link
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 9 lines checked
netdev/build_allmodconfig_warn success Errors and warnings before: 4 this patch: 4
netdev/header_inline success Link
netdev/stable success Stable not CCed

Commit Message

Vladimir Oltean Feb. 15, 2021, 9:09 p.m. UTC 
From: Vladimir Oltean <vladimir.oltean@nxp.com>

The prototype of br_vlan_filter_toggle was updated to include a netlink
extack, but the stub definition wasn't, which results in a build error
when CONFIG_BRIDGE_VLAN_FILTERING=n.

Fixes: 9e781401cbfc ("net: bridge: propagate extack through store_bridge_parm")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 net/bridge/br_private.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

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