Commit 644bca1d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next 



There's a fix which landed in net-next, pull it in along
with the couple of minor cleanups.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 93e0401e cb9e6e58

drivers/isdn/mISDN/dsp_cmx.c

+2 −13
Original line number Diff line number Diff line
@@ -141,17 +141,6 @@ 
/*#define CMX_DELAY_DEBUG * gives rx-buffer delay overview */

/*#define CMX_TX_DEBUG * massive read/write on tx-buffer with content */



static inline int

count_list_member(struct list_head *head)

{

	int			cnt = 0;

	struct list_head	*m;



	list_for_each(m, head)

		cnt++;

	return cnt;

}



/*

 * debug cmx memory structure

 */
@@ -1672,7 +1661,7 @@ dsp_cmx_send(void *arg) 
		mustmix = 0;

		members = 0;

		if (conf) {

			members = count_list_member(&conf->mlist);

			members = list_count_nodes(&conf->mlist);

#ifdef CMX_CONF_DEBUG

			if (conf->software && members > 1)

#else
@@ -1695,7 +1684,7 @@ dsp_cmx_send(void *arg) 
	/* loop all members that require conference mixing */

	list_for_each_entry(conf, &conf_ilist, list) {

		/* count members and check hardware */

		members = count_list_member(&conf->mlist);

		members = list_count_nodes(&conf->mlist);

#ifdef CMX_CONF_DEBUG

		if (conf->software && members > 1) {

#else

drivers/net/bonding/bond_main.c

+29 −0
Original line number Diff line number Diff line
@@ -1789,6 +1789,26 @@ static void bond_ether_setup(struct net_device *bond_dev) 
	bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;

}



void bond_xdp_set_features(struct net_device *bond_dev)

{

	struct bonding *bond = netdev_priv(bond_dev);

	xdp_features_t val = NETDEV_XDP_ACT_MASK;

	struct list_head *iter;

	struct slave *slave;



	ASSERT_RTNL();



	if (!bond_xdp_check(bond)) {

		xdp_clear_features_flag(bond_dev);

		return;

	}



	bond_for_each_slave(bond, slave, iter)

		val &= slave->dev->xdp_features;



	xdp_set_features_flag(bond_dev, val);

}



/* enslave device <slave> to bond device <master> */

int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,

		 struct netlink_ext_ack *extack)
@@ -2236,6 +2256,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
			bpf_prog_inc(bond->xdp_prog);

	}



	bond_xdp_set_features(bond_dev);



	slave_info(bond_dev, slave_dev, "Enslaving as %s interface with %s link\n",

		   bond_is_active_slave(new_slave) ? "an active" : "a backup",

		   new_slave->link != BOND_LINK_DOWN ? "an up" : "a down");
@@ -2483,6 +2505,7 @@ static int __bond_release_one(struct net_device *bond_dev, 
	if (!netif_is_bond_master(slave_dev))

		slave_dev->priv_flags &= ~IFF_BONDING;



	bond_xdp_set_features(bond_dev);

	kobject_put(&slave->kobj);



	return 0;
@@ -3930,6 +3953,9 @@ static int bond_slave_netdev_event(unsigned long event, 
		/* Propagate to master device */

		call_netdevice_notifiers(event, slave->bond->dev);

		break;

	case NETDEV_XDP_FEAT_CHANGE:

		bond_xdp_set_features(bond_dev);

		break;

	default:

		break;

	}
@@ -5874,6 +5900,9 @@ void bond_setup(struct net_device *bond_dev) 
	if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP)

		bond_dev->features |= BOND_XFRM_FEATURES;

#endif /* CONFIG_XFRM_OFFLOAD */



	if (bond_xdp_check(bond))

		bond_dev->xdp_features = NETDEV_XDP_ACT_MASK;

}



/* Destroy a bonding device.

drivers/net/bonding/bond_options.c

+2 −0
Original line number Diff line number Diff line
@@ -877,6 +877,8 @@ static int bond_option_mode_set(struct bonding *bond, 
			netdev_update_features(bond->dev);

	}



	bond_xdp_set_features(bond->dev);



	return 0;

}

drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c

+2 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static int aq_a2_fw_get_mac_permanent(struct aq_hw_s *self, u8 *mac) 
static void aq_a2_fill_a0_stats(struct aq_hw_s *self,

				struct statistics_s *stats)

{

	struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv;

	struct hw_atl2_priv *priv = self->priv;

	struct aq_stats_s *cs = &self->curr_stats;

	struct aq_stats_s curr_stats = *cs;

	bool corrupted_stats = false;
@@ -378,7 +378,7 @@ do { \ 
static void aq_a2_fill_b0_stats(struct aq_hw_s *self,

				struct statistics_s *stats)

{

	struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv;

	struct hw_atl2_priv *priv = self->priv;

	struct aq_stats_s *cs = &self->curr_stats;

	struct aq_stats_s curr_stats = *cs;

	bool corrupted_stats = false;

fs/9p/Kconfig

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config 9P_FS

	tristate "Plan 9 Resource Sharing Support (9P2000)"

	depends on INET && NET_9P

	depends on NET_9P

	select NETFS_SUPPORT

	help

	  If you say Y here, you will get experimental support for