Merge tag 'net-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (79c0c1f0) · Commits · 戴 / test

Documentation/networking/netdev-FAQ.rst

+26 −0

Original line number	Diff line number	Diff line
		@@ -254,6 +254,32 @@ you will have done run-time testing specific to your change, but at a
		minimum, your changes should survive an ``allyesconfig`` and an
		``allmodconfig`` build without new warnings or failures.

		Q: How do I post corresponding changes to user space components?
		----------------------------------------------------------------
		A: User space code exercising kernel features should be posted
		alongside kernel patches. This gives reviewers a chance to see
		how any new interface is used and how well it works.

		When user space tools reside in the kernel repo itself all changes
		should generally come as one series. If series becomes too large
		or the user space project is not reviewed on netdev include a link
		to a public repo where user space patches can be seen.

		In case user space tooling lives in a separate repository but is
		reviewed on netdev (e.g. patches to `iproute2` tools) kernel and
		user space patches should form separate series (threads) when posted
		to the mailing list, e.g.::

		[PATCH net-next 0/3] net: some feature cover letter
		└─ [PATCH net-next 1/3] net: some feature prep
		└─ [PATCH net-next 2/3] net: some feature do it
		└─ [PATCH net-next 3/3] selftest: net: some feature

		[PATCH iproute2-next] ip: add support for some feature

		Posting as one thread is discouraged because it confuses patchwork
		(as of patchwork 2.2.2).

		Q: Any other tips to help ensure my net/net-next patch gets OK'd?
		-----------------------------------------------------------------
		A: Attention to detail. Re-read your own work as if you were the

MAINTAINERS

+9 −7

Original line number	Diff line number	Diff line
		@@ -3528,11 +3528,12 @@ BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
		M: Arend van Spriel <arend.vanspriel@broadcom.com>
		M: Franky Lin <franky.lin@broadcom.com>
		M: Hante Meuleman <hante.meuleman@broadcom.com>
		M: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
		M: Wright Feng <wright.feng@cypress.com>
		M: Chi-hsien Lin <chi-hsien.lin@infineon.com>
		M: Wright Feng <wright.feng@infineon.com>
		M: Chung-hsien Hsu <chung-hsien.hsu@infineon.com>
		L: linux-wireless@vger.kernel.org
		L: brcm80211-dev-list.pdl@broadcom.com
		L: brcm80211-dev-list@cypress.com
		L: SHA-cyfmac-dev-list@infineon.com
		S: Supported
		F: drivers/net/wireless/broadcom/brcm80211/

		@@ -13162,7 +13163,9 @@ M: Jesper Dangaard Brouer <hawk@kernel.org>
		M: Ilias Apalodimas <ilias.apalodimas@linaro.org>
		L: netdev@vger.kernel.org
		S: Supported
		F: Documentation/networking/page_pool.rst
		F: include/net/page_pool.h
		F: include/trace/events/page_pool.h
		F: net/core/page_pool.c

		PANASONIC LAPTOP ACPI EXTRAS DRIVER
		@@ -14804,7 +14807,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.g
		F: drivers/net/wireless/realtek/rtlwifi/

		REALTEK WIRELESS DRIVER (rtw88)
		M: Yan-Hsuan Chuang <yhchuang@realtek.com>
		M: Yan-Hsuan Chuang <tony0620emma@gmail.com>
		L: linux-wireless@vger.kernel.org
		S: Maintained
		F: drivers/net/wireless/realtek/rtw88/
		@@ -15777,9 +15780,8 @@ F: drivers/slimbus/
		F: include/linux/slimbus.h

		SFC NETWORK DRIVER
		M: Solarflare linux maintainers <linux-net-drivers@solarflare.com>
		M: Edward Cree <ecree@solarflare.com>
		M: Martin Habets <mhabets@solarflare.com>
		M: Edward Cree <ecree.xilinx@gmail.com>
		M: Martin Habets <habetsm.xilinx@gmail.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/ethernet/sfc/

drivers/net/bonding/bond_main.c

+43 −18

Original line number	Diff line number	Diff line
		@@ -1460,7 +1460,39 @@ static void bond_upper_dev_unlink(struct bonding bond, struct slave slave)
		slave->dev->flags &= ~IFF_SLAVE;
		}

		static struct slave bond_alloc_slave(struct bonding bond)
		static void slave_kobj_release(struct kobject *kobj)
		{
		struct slave *slave = to_slave(kobj);
		struct bonding *bond = bond_get_bond_by_slave(slave);

		cancel_delayed_work_sync(&slave->notify_work);
		if (BOND_MODE(bond) == BOND_MODE_8023AD)
		kfree(SLAVE_AD_INFO(slave));

		kfree(slave);
		}

		static struct kobj_type slave_ktype = {
		.release = slave_kobj_release,
		#ifdef CONFIG_SYSFS
		.sysfs_ops = &slave_sysfs_ops,
		#endif
		};

		static int bond_kobj_init(struct slave *slave)
		{
		int err;

		err = kobject_init_and_add(&slave->kobj, &slave_ktype,
		&(slave->dev->dev.kobj), "bonding_slave");
		if (err)
		kobject_put(&slave->kobj);

		return err;
		}

		static struct slave bond_alloc_slave(struct bonding bond,
		struct net_device *slave_dev)
		{
		struct slave *slave = NULL;

		@@ -1468,11 +1500,17 @@ static struct slave bond_alloc_slave(struct bonding bond)
		if (!slave)
		return NULL;

		slave->bond = bond;
		slave->dev = slave_dev;

		if (bond_kobj_init(slave))
		return NULL;

		if (BOND_MODE(bond) == BOND_MODE_8023AD) {
		SLAVE_AD_INFO(slave) = kzalloc(sizeof(struct ad_slave_info),
		GFP_KERNEL);
		if (!SLAVE_AD_INFO(slave)) {
		kfree(slave);
		kobject_put(&slave->kobj);
		return NULL;
		}
		}
		@@ -1481,17 +1519,6 @@ static struct slave bond_alloc_slave(struct bonding bond)
		return slave;
		}

		static void bond_free_slave(struct slave *slave)
		{
		struct bonding *bond = bond_get_bond_by_slave(slave);

		cancel_delayed_work_sync(&slave->notify_work);
		if (BOND_MODE(bond) == BOND_MODE_8023AD)
		kfree(SLAVE_AD_INFO(slave));

		kfree(slave);
		}

		static void bond_fill_ifbond(struct bonding bond, struct ifbond info)
		{
		info->bond_mode = BOND_MODE(bond);
		@@ -1678,14 +1705,12 @@ int bond_enslave(struct net_device bond_dev, struct net_device slave_dev,
		goto err_undo_flags;
		}

		new_slave = bond_alloc_slave(bond);
		new_slave = bond_alloc_slave(bond, slave_dev);
		if (!new_slave) {
		res = -ENOMEM;
		goto err_undo_flags;
		}

		new_slave->bond = bond;
		new_slave->dev = slave_dev;
		/* Set the new_slave's queue_id to be zero. Queue ID mapping
		* is set via sysfs or module option if desired.
		*/
		@@ -2007,7 +2032,7 @@ err_restore_mtu:
		dev_set_mtu(slave_dev, new_slave->original_mtu);

		err_free:
		bond_free_slave(new_slave);
		kobject_put(&new_slave->kobj);

		err_undo_flags:
		/* Enslave of first slave has failed and we need to fix master's mac */
		@@ -2187,7 +2212,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_free_slave(slave);
		kobject_put(&slave->kobj);

		return 0;
		}

drivers/net/bonding/bond_sysfs_slave.c

+1 −17

Original line number	Diff line number	Diff line
		@@ -121,7 +121,6 @@ static const struct slave_attribute *slave_attrs[] = {
		};

		#define to_slave_attr(_at) container_of(_at, struct slave_attribute, attr)
		#define to_slave(obj) container_of(obj, struct slave, kobj)

		static ssize_t slave_show(struct kobject *kobj,
		struct attribute attr, char buf)
		@@ -132,28 +131,15 @@ static ssize_t slave_show(struct kobject *kobj,
		return slave_attr->show(slave, buf);
		}

		static const struct sysfs_ops slave_sysfs_ops = {
		const struct sysfs_ops slave_sysfs_ops = {
		.show = slave_show,
		};

		static struct kobj_type slave_ktype = {
		#ifdef CONFIG_SYSFS
		.sysfs_ops = &slave_sysfs_ops,
		#endif
		};

		int bond_sysfs_slave_add(struct slave *slave)
		{
		const struct slave_attribute **a;
		int err;

		err = kobject_init_and_add(&slave->kobj, &slave_ktype,
		&(slave->dev->dev.kobj), "bonding_slave");
		if (err) {
		kobject_put(&slave->kobj);
		return err;
		}

		for (a = slave_attrs; *a; ++a) {
		err = sysfs_create_file(&slave->kobj, &((*a)->attr));
		if (err) {
		@@ -171,6 +157,4 @@ void bond_sysfs_slave_del(struct slave *slave)

		for (a = slave_attrs; *a; ++a)
		sysfs_remove_file(&slave->kobj, &((*a)->attr));

		kobject_put(&slave->kobj);
		}

drivers/net/can/m_can/m_can.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1033,7 +1033,7 @@ static const struct can_bittiming_const m_can_bittiming_const_31X = {
		.name = KBUILD_MODNAME,
		.tseg1_min = 2, /* Time segment 1 = prop_seg + phase_seg1 */
		.tseg1_max = 256,
		.tseg2_min = 1, /* Time segment 2 = phase_seg2 */
		.tseg2_min = 2, /* Time segment 2 = phase_seg2 */
		.tseg2_max = 128,
		.sjw_max = 128,
		.brp_min = 1,
		@@ -1385,6 +1385,8 @@ static int m_can_dev_setup(struct m_can_classdev *m_can_dev)
		&m_can_data_bittiming_const_31X;
		break;
		case 32:
		case 33:
		/* Support both MCAN version v3.2.x and v3.3.0 */
		m_can_dev->can.bittiming_const = m_can_dev->bit_timing ?
		m_can_dev->bit_timing : &m_can_bittiming_const_31X;

		@@ -1653,7 +1655,7 @@ static int m_can_open(struct net_device *dev)
		INIT_WORK(&cdev->tx_work, m_can_tx_work_queue);

		err = request_threaded_irq(dev->irq, NULL, m_can_isr,
		IRQF_ONESHOT \| IRQF_TRIGGER_FALLING,
		IRQF_ONESHOT,
		dev->name, dev);
		} else {
		err = request_irq(dev->irq, m_can_isr, IRQF_SHARED, dev->name,

Admin message