| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <aa933e80-d724-ab1f-1666-0cc136253d66@cumulusnetworks.com>
Date: Thu, 20 Feb 2020 10:22:13 +0200
From: Nikolay Aleksandrov <nikolay@...ulusnetworks.com>
To: Julian Wiedmann <jwi@...ux.ibm.com>,
David Miller <davem@...emloft.net>
Cc: netdev <netdev@...r.kernel.org>,
Johannes Berg <johannes@...solutions.net>,
Roopa Prabhu <roopa@...ulusnetworks.com>
Subject: Re: [PATCH net-next] net: use netif_is_bridge_port() to check for
IFF_BRIDGE_PORT
On 20/02/2020 10:00, Julian Wiedmann wrote:
> Trivial cleanup, so that all bridge port-specific code can be found in
> one go.
>
> CC: Johannes Berg <johannes@...solutions.net>
> CC: Roopa Prabhu <roopa@...ulusnetworks.com>
> CC: Nikolay Aleksandrov <nikolay@...ulusnetworks.com>
> Signed-off-by: Julian Wiedmann <jwi@...ux.ibm.com>
> ---
> drivers/net/bonding/bond_main.c | 2 +-
> drivers/net/ethernet/micrel/ksz884x.c | 2 +-
> net/core/rtnetlink.c | 12 ++++++------
> net/wireless/nl80211.c | 2 +-
> net/wireless/util.c | 2 +-
> 5 files changed, 10 insertions(+), 10 deletions(-)
>
LGTM,
Reviewed-by: Nikolay Aleksandrov <nikolay@...ulusnetworks.com>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index 48d5ec770b94..c3c524f77fcd 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -1265,7 +1265,7 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
> skb->dev = bond->dev;
>
> if (BOND_MODE(bond) == BOND_MODE_ALB &&
> - bond->dev->priv_flags & IFF_BRIDGE_PORT &&
> + netif_is_bridge_port(bond->dev) &&
> skb->pkt_type == PACKET_HOST) {
>
> if (unlikely(skb_cow_head(skb,
> diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
> index d1444ba36e10..4fe6aedca22f 100644
> --- a/drivers/net/ethernet/micrel/ksz884x.c
> +++ b/drivers/net/ethernet/micrel/ksz884x.c
> @@ -5694,7 +5694,7 @@ static void dev_set_promiscuous(struct net_device *dev, struct dev_priv *priv,
> * from the bridge.
> */
> if ((hw->features & STP_SUPPORT) && !promiscuous &&
> - (dev->priv_flags & IFF_BRIDGE_PORT)) {
> + netif_is_bridge_port(dev)) {
> struct ksz_switch *sw = hw->ksz_switch;
> int port = priv->port.first_port;
>
> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
> index 9b4f8a254a15..6e35742969e6 100644
> --- a/net/core/rtnetlink.c
> +++ b/net/core/rtnetlink.c
> @@ -3911,7 +3911,7 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,
>
> /* Support fdb on master device the net/bridge default case */
> if ((!ndm->ndm_flags || ndm->ndm_flags & NTF_MASTER) &&
> - (dev->priv_flags & IFF_BRIDGE_PORT)) {
> + netif_is_bridge_port(dev)) {
> struct net_device *br_dev = netdev_master_upper_dev_get(dev);
> const struct net_device_ops *ops = br_dev->netdev_ops;
>
> @@ -4022,7 +4022,7 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
>
> /* Support fdb on master device the net/bridge default case */
> if ((!ndm->ndm_flags || ndm->ndm_flags & NTF_MASTER) &&
> - (dev->priv_flags & IFF_BRIDGE_PORT)) {
> + netif_is_bridge_port(dev)) {
> struct net_device *br_dev = netdev_master_upper_dev_get(dev);
> const struct net_device_ops *ops = br_dev->netdev_ops;
>
> @@ -4248,13 +4248,13 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
> continue;
>
> if (!br_idx) { /* user did not specify a specific bridge */
> - if (dev->priv_flags & IFF_BRIDGE_PORT) {
> + if (netif_is_bridge_port(dev)) {
> br_dev = netdev_master_upper_dev_get(dev);
> cops = br_dev->netdev_ops;
> }
> } else {
> if (dev != br_dev &&
> - !(dev->priv_flags & IFF_BRIDGE_PORT))
> + !netif_is_bridge_port(dev))
> continue;
>
> if (br_dev != netdev_master_upper_dev_get(dev) &&
> @@ -4266,7 +4266,7 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
> if (idx < s_idx)
> goto cont;
>
> - if (dev->priv_flags & IFF_BRIDGE_PORT) {
> + if (netif_is_bridge_port(dev)) {
> if (cops && cops->ndo_fdb_dump) {
> err = cops->ndo_fdb_dump(skb, cb,
> br_dev, dev,
> @@ -4416,7 +4416,7 @@ static int rtnl_fdb_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,
>
> if (dev) {
> if (!ndm_flags || (ndm_flags & NTF_MASTER)) {
> - if (!(dev->priv_flags & IFF_BRIDGE_PORT)) {
> + if (!netif_is_bridge_port(dev)) {
> NL_SET_ERR_MSG(extack, "Device is not a bridge port");
> return -EINVAL;
> }
> diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
> index f0112dabe21e..8c2a246099ef 100644
> --- a/net/wireless/nl80211.c
> +++ b/net/wireless/nl80211.c
> @@ -3531,7 +3531,7 @@ static int nl80211_valid_4addr(struct cfg80211_registered_device *rdev,
> enum nl80211_iftype iftype)
> {
> if (!use_4addr) {
> - if (netdev && (netdev->priv_flags & IFF_BRIDGE_PORT))
> + if (netdev && netif_is_bridge_port(netdev))
> return -EBUSY;
> return 0;
> }
> diff --git a/net/wireless/util.c b/net/wireless/util.c
> index 8481e9ac33da..80fb47c43bdd 100644
> --- a/net/wireless/util.c
> +++ b/net/wireless/util.c
> @@ -934,7 +934,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
> return -EOPNOTSUPP;
>
> /* if it's part of a bridge, reject changing type to station/ibss */
> - if ((dev->priv_flags & IFF_BRIDGE_PORT) &&
> + if (netif_is_bridge_port(dev) &&
> (ntype == NL80211_IFTYPE_ADHOC ||
> ntype == NL80211_IFTYPE_STATION ||
> ntype == NL80211_IFTYPE_P2P_CLIENT))
>
Powered by blists - more mailing lists