* [PATCH net-next 0/2] Fixing build breakage after "Merge branch 'Propagate-extack-for-switchdev-LANs-from-DSA'"
@ 2021-02-15 21:09 Vladimir Oltean
2021-02-15 21:09 ` [PATCH net-next 1/2] net: bridge: fix switchdev_port_attr_set stub when CONFIG_SWITCHDEV=n Vladimir Oltean
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Vladimir Oltean @ 2021-02-15 21:09 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski, netdev
Cc: Roopa Prabhu, Nikolay Aleksandrov
From: Vladimir Oltean <vladimir.oltean@nxp.com>
There were two build issues in the 'Propagate extack for switchdev VLANs
from DSA', both related to function prototypes not updated for some stub
definitions when CONFIG_SWITCHDEV=n and CONFIG_BRIDGE_VLAN_FILTERING=n.
Vladimir Oltean (2):
net: bridge: fix switchdev_port_attr_set stub when CONFIG_SWITCHDEV=n
net: bridge: fix br_vlan_filter_toggle stub when
CONFIG_BRIDGE_VLAN_FILTERING=n
include/net/switchdev.h | 3 ++-
net/bridge/br_private.h | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net-next 1/2] net: bridge: fix switchdev_port_attr_set stub when CONFIG_SWITCHDEV=n
2021-02-15 21:09 [PATCH net-next 0/2] Fixing build breakage after "Merge branch 'Propagate-extack-for-switchdev-LANs-from-DSA'" Vladimir Oltean
@ 2021-02-15 21:09 ` Vladimir Oltean
2021-02-15 21:09 ` [PATCH net-next 2/2] net: bridge: fix br_vlan_filter_toggle stub when CONFIG_BRIDGE_VLAN_FILTERING=n Vladimir Oltean
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Vladimir Oltean @ 2021-02-15 21:09 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski, netdev
Cc: Roopa Prabhu, Nikolay Aleksandrov
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 --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;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next 2/2] net: bridge: fix br_vlan_filter_toggle stub when CONFIG_BRIDGE_VLAN_FILTERING=n
2021-02-15 21:09 [PATCH net-next 0/2] Fixing build breakage after "Merge branch 'Propagate-extack-for-switchdev-LANs-from-DSA'" Vladimir Oltean
2021-02-15 21:09 ` [PATCH net-next 1/2] net: bridge: fix switchdev_port_attr_set stub when CONFIG_SWITCHDEV=n Vladimir Oltean
@ 2021-02-15 21:09 ` Vladimir Oltean
2021-02-15 21:20 ` [PATCH net-next 0/2] Fixing build breakage after "Merge branch 'Propagate-extack-for-switchdev-LANs-from-DSA'" patchwork-bot+netdevbpf
2021-02-15 21:48 ` Nikolay Aleksandrov
3 siblings, 0 replies; 5+ messages in thread
From: Vladimir Oltean @ 2021-02-15 21:09 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski, netdev
Cc: Roopa Prabhu, Nikolay Aleksandrov
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 --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;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 0/2] Fixing build breakage after "Merge branch 'Propagate-extack-for-switchdev-LANs-from-DSA'"
2021-02-15 21:09 [PATCH net-next 0/2] Fixing build breakage after "Merge branch 'Propagate-extack-for-switchdev-LANs-from-DSA'" Vladimir Oltean
2021-02-15 21:09 ` [PATCH net-next 1/2] net: bridge: fix switchdev_port_attr_set stub when CONFIG_SWITCHDEV=n Vladimir Oltean
2021-02-15 21:09 ` [PATCH net-next 2/2] net: bridge: fix br_vlan_filter_toggle stub when CONFIG_BRIDGE_VLAN_FILTERING=n Vladimir Oltean
@ 2021-02-15 21:20 ` patchwork-bot+netdevbpf
2021-02-15 21:48 ` Nikolay Aleksandrov
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-02-15 21:20 UTC (permalink / raw)
To: Vladimir Oltean; +Cc: davem, kuba, netdev, roopa, nikolay
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Mon, 15 Feb 2021 23:09:10 +0200 you wrote:
> From: Vladimir Oltean <vladimir.oltean@nxp.com>
>
> There were two build issues in the 'Propagate extack for switchdev VLANs
> from DSA', both related to function prototypes not updated for some stub
> definitions when CONFIG_SWITCHDEV=n and CONFIG_BRIDGE_VLAN_FILTERING=n.
>
> Vladimir Oltean (2):
> net: bridge: fix switchdev_port_attr_set stub when CONFIG_SWITCHDEV=n
> net: bridge: fix br_vlan_filter_toggle stub when
> CONFIG_BRIDGE_VLAN_FILTERING=n
>
> [...]
Here is the summary with links:
- [net-next,1/2] net: bridge: fix switchdev_port_attr_set stub when CONFIG_SWITCHDEV=n
https://git.kernel.org/netdev/net-next/c/419dfaed7ccc
- [net-next,2/2] net: bridge: fix br_vlan_filter_toggle stub when CONFIG_BRIDGE_VLAN_FILTERING=n
https://git.kernel.org/netdev/net-next/c/c97f47e3c198
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 0/2] Fixing build breakage after "Merge branch 'Propagate-extack-for-switchdev-LANs-from-DSA'"
2021-02-15 21:09 [PATCH net-next 0/2] Fixing build breakage after "Merge branch 'Propagate-extack-for-switchdev-LANs-from-DSA'" Vladimir Oltean
` (2 preceding siblings ...)
2021-02-15 21:20 ` [PATCH net-next 0/2] Fixing build breakage after "Merge branch 'Propagate-extack-for-switchdev-LANs-from-DSA'" patchwork-bot+netdevbpf
@ 2021-02-15 21:48 ` Nikolay Aleksandrov
3 siblings, 0 replies; 5+ messages in thread
From: Nikolay Aleksandrov @ 2021-02-15 21:48 UTC (permalink / raw)
To: Vladimir Oltean, David S . Miller, Jakub Kicinski, netdev; +Cc: Roopa Prabhu
On 15/02/2021 23:09, Vladimir Oltean wrote:
> From: Vladimir Oltean <vladimir.oltean@nxp.com>
>
> There were two build issues in the 'Propagate extack for switchdev VLANs
> from DSA', both related to function prototypes not updated for some stub
> definitions when CONFIG_SWITCHDEV=n and CONFIG_BRIDGE_VLAN_FILTERING=n.
>
> Vladimir Oltean (2):
> net: bridge: fix switchdev_port_attr_set stub when CONFIG_SWITCHDEV=n
> net: bridge: fix br_vlan_filter_toggle stub when
> CONFIG_BRIDGE_VLAN_FILTERING=n
>
> include/net/switchdev.h | 3 ++-
> net/bridge/br_private.h | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
This was unexpected. :) Thanks for fixing these so quickly.
FWIW:
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-02-15 21:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-15 21:09 [PATCH net-next 0/2] Fixing build breakage after "Merge branch 'Propagate-extack-for-switchdev-LANs-from-DSA'" Vladimir Oltean
2021-02-15 21:09 ` [PATCH net-next 1/2] net: bridge: fix switchdev_port_attr_set stub when CONFIG_SWITCHDEV=n Vladimir Oltean
2021-02-15 21:09 ` [PATCH net-next 2/2] net: bridge: fix br_vlan_filter_toggle stub when CONFIG_BRIDGE_VLAN_FILTERING=n Vladimir Oltean
2021-02-15 21:20 ` [PATCH net-next 0/2] Fixing build breakage after "Merge branch 'Propagate-extack-for-switchdev-LANs-from-DSA'" patchwork-bot+netdevbpf
2021-02-15 21:48 ` Nikolay Aleksandrov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.