diff mbox series

[net-next,1/2] net: bridge: fix switchdev_port_attr_set stub when CONFIG_SWITCHDEV=n

Message ID 20210215210912.2633895-2-olteanv@gmail.com (mailing list archive)
State Accepted
Commit 419dfaed7ccc9533b3f4d88eb6f4997b41f8a4fc
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: f.fainelli@gmail.com vladimir.oltean@nxp.com; 4 maintainers not CCed: f.fainelli@gmail.com vladimir.oltean@nxp.com jiri@resnulli.us ivecera@redhat.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: 156 this patch: 156
netdev/kdoc success Errors and warnings before: 0 this patch: 0
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: 182 this patch: 182
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 switchdev_port_attr_set function prototype was updated only for the
case where CONFIG_SWITCHDEV=y|m, leaving a prototype mismatch with the
stub definition for the disabled case. This results in a build error, so
update that function too.

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

Patch

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