Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dba9e632 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Greg Kroah-Hartman
Browse files

net: use netif_is_bridge_port() to check for IFF_BRIDGE_PORT 



[ Upstream commit 2e92a2d0e450740ebe7e7a816162327ad1fde94b ]

Trivial cleanup, so that all bridge port-specific code can be found in
one go.

CC: Johannes Berg <johannes@sipsolutions.net>
CC: Roopa Prabhu <roopa@cumulusnetworks.com>
CC: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0f5b4c57

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,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,

drivers/net/ethernet/micrel/ksz884x.c

+1 −1
Original line number Diff line number Diff line
@@ -5693,7 +5693,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;

net/core/rtnetlink.c

+6 −6
Original line number Diff line number Diff line
@@ -3729,7 +3729,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;
@@ -3840,7 +3840,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;
@@ -4066,13 +4066,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) &&
@@ -4084,7 +4084,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,
@@ -4234,7 +4234,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;

			}

net/wireless/nl80211.c

+1 −1
Original line number Diff line number Diff line
@@ -3480,7 +3480,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;

	}

net/wireless/util.c

+1 −1
Original line number Diff line number Diff line
@@ -976,7 +976,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))