From: Vladimir Oltean <olteanv@gmail.com>
To: "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org
Cc: Roopa Prabhu <roopa@nvidia.com>,
Nikolay Aleksandrov <nikolay@nvidia.com>
Subject: [PATCH net-next 2/2] net: bridge: fix br_vlan_filter_toggle stub when CONFIG_BRIDGE_VLAN_FILTERING=n
Date: Mon, 15 Feb 2021 23:09:12 +0200 [thread overview]
Message-ID: <20210215210912.2633895-3-olteanv@gmail.com> (raw)
In-Reply-To: <20210215210912.2633895-1-olteanv@gmail.com>
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
next prev parent reply other threads:[~2021-02-15 21:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210215210912.2633895-3-olteanv@gmail.com \
--to=olteanv@gmail.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@nvidia.com \
--cc=roopa@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).