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

Commit 46c264da authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

bridge/nl: remove wrong use of NLM_F_MULTI 



NLM_F_MULTI must be used only when a NLMSG_DONE message is sent. In fact,
it is sent only at the end of a dump.

Libraries like libnl will wait forever for NLMSG_DONE.

Fixes: e5a55a89 ("net: create generic bridge ops")
Fixes: 815cccbf ("ixgbe: add setlink, getlink support to ixgbe and ixgbevf")
CC: John Fastabend <john.r.fastabend@intel.com>
CC: Sathya Perla <sathya.perla@emulex.com>
CC: Subbu Seetharaman <subbu.seetharaman@emulex.com>
CC: Ajit Khaparde <ajit.khaparde@emulex.com>
CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: intel-wired-lan@lists.osuosl.org
CC: Jiri Pirko <jiri@resnulli.us>
CC: Scott Feldman <sfeldma@gmail.com>
CC: Stephen Hemminger <stephen@networkplumber.org>
CC: bridge@lists.linux-foundation.org
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82199679

drivers/net/ethernet/emulex/benet/be_main.c

+3 −2
Original line number Diff line number Diff line
@@ -4846,7 +4846,8 @@ static int be_ndo_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh, 
}



static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,

				 struct net_device *dev, u32 filter_mask)

				 struct net_device *dev, u32 filter_mask,

				 int nlflags)

{

	struct be_adapter *adapter = netdev_priv(dev);

	int status = 0;
@@ -4868,7 +4869,7 @@ static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, 
	return ndo_dflt_bridge_getlink(skb, pid, seq, dev,

				       hsw_mode == PORT_FWD_TYPE_VEPA ?

				       BRIDGE_MODE_VEPA : BRIDGE_MODE_VEB,

				       0, 0);

				       0, 0, nlflags);

}



#ifdef CONFIG_BE2NET_VXLAN

drivers/net/ethernet/intel/i40e/i40e_main.c

+4 −3
Original line number Diff line number Diff line
@@ -8053,10 +8053,10 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev, 
#ifdef HAVE_BRIDGE_FILTER

static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,

				   struct net_device *dev,

				   u32 __always_unused filter_mask)

				   u32 __always_unused filter_mask, int nlflags)

#else

static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,

				   struct net_device *dev)

				   struct net_device *dev, int nlflags)

#endif /* HAVE_BRIDGE_FILTER */

{

	struct i40e_netdev_priv *np = netdev_priv(dev);
@@ -8078,7 +8078,8 @@ static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, 
	if (!veb)

		return 0;



	return ndo_dflt_bridge_getlink(skb, pid, seq, dev, veb->bridge_mode);

	return ndo_dflt_bridge_getlink(skb, pid, seq, dev, veb->bridge_mode,

				       nlflags);

}

#endif /* HAVE_BRIDGE_ATTRIBS */

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −2
Original line number Diff line number Diff line
@@ -8044,7 +8044,7 @@ static int ixgbe_ndo_bridge_setlink(struct net_device *dev, 


static int ixgbe_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,

				    struct net_device *dev,

				    u32 filter_mask)

				    u32 filter_mask, int nlflags)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);
@@ -8052,7 +8052,7 @@ static int ixgbe_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, 
		return 0;



	return ndo_dflt_bridge_getlink(skb, pid, seq, dev,

				       adapter->bridge_mode, 0, 0);

				       adapter->bridge_mode, 0, 0, nlflags);

}



static void *ixgbe_fwd_add(struct net_device *pdev, struct net_device *vdev)

drivers/net/ethernet/rocker/rocker.c

+3 −2
Original line number Diff line number Diff line
@@ -4176,14 +4176,15 @@ static int rocker_port_bridge_setlink(struct net_device *dev, 


static int rocker_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,

				      struct net_device *dev,

				      u32 filter_mask)

				      u32 filter_mask, int nlflags)

{

	struct rocker_port *rocker_port = netdev_priv(dev);

	u16 mode = BRIDGE_MODE_UNDEF;

	u32 mask = BR_LEARNING | BR_LEARNING_SYNC;



	return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode,

				       rocker_port->brport_flags, mask);

				       rocker_port->brport_flags, mask,

				       nlflags);

}



static int rocker_port_get_phys_port_name(struct net_device *dev,

include/linux/netdevice.h

+4 −2
Original line number Diff line number Diff line
@@ -977,7 +977,8 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev, 
 * int (*ndo_bridge_setlink)(struct net_device *dev, struct nlmsghdr *nlh,

 *			     u16 flags)

 * int (*ndo_bridge_getlink)(struct sk_buff *skb, u32 pid, u32 seq,

 *			     struct net_device *dev, u32 filter_mask)

 *			     struct net_device *dev, u32 filter_mask,

 *			     int nlflags)

 * int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh,

 *			     u16 flags);

 *
@@ -1173,7 +1174,8 @@ struct net_device_ops { 
	int			(*ndo_bridge_getlink)(struct sk_buff *skb,

						      u32 pid, u32 seq,

						      struct net_device *dev,

						      u32 filter_mask);

						      u32 filter_mask,

						      int nlflags);

	int			(*ndo_bridge_dellink)(struct net_device *dev,

						      struct nlmsghdr *nlh,

						      u16 flags);