Skip to content

Commit 478a351

Browse files
torvaldstorvalds
committed
Merge tag 'net-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Including fixes from netfilter, wifi and ipsec. A little more changes than usual, but it's pretty normal for us that the rc3/rc4 PRs are oversized as people start testing in earnest. Possibly an extra boost from people deploying the 6.1 LTS but that's more of an unscientific hunch. Current release - regressions: - phy: mscc: fix deadlock in phy_ethtool_{get,set}_wol() - virtio: vsock: don't use skbuff state to account credit - virtio: vsock: don't drop skbuff on copy failure - virtio_net: fix page_to_skb() miscalculating the memory size Current release - new code bugs: - eth: correct xdp_features after device reconfig - wifi: nl80211: fix the puncturing bitmap policy - net/mlx5e: flower: - fix raw counter initialization - fix missing error code - fix cloned flow attribute - ipa: - fix some register validity checks - fix a surprising number of bad offsets - kill FILT_ROUT_CACHE_CFG IPA register Previous releases - regressions: - tcp: fix bind() conflict check for dual-stack wildcard address - veth: fix use after free in XDP_REDIRECT when skb headroom is small - ipv4: fix incorrect table ID in IOCTL path - ipvlan: make skb->skb_iif track skb->dev for l3s mode - mptcp: - fix possible deadlock in subflow_error_report - fix UaFs when destroying unaccepted and listening sockets - dsa: mv88e6xxx: fix max_mtu of 1492 on 6165, 6191, 6220, 6250, 6290 Previous releases - always broken: - tcp: tcp_make_synack() can be called from process context, don't assume preemption is disabled when updating stats - netfilter: correct length for loading protocol registers - virtio_net: add checking sq is full inside xdp xmit - bonding: restore IFF_MASTER/SLAVE flags on bond enslave Ethertype change - phy: nxp-c45-tja11xx: fix MII_BASIC_CONFIG_REV bit number - eth: i40e: fix crash during reboot when adapter is in recovery mode - eth: ice: avoid deadlock on rtnl lock when auxiliary device plug/unplug meets bonding - dsa: mt7530: - remove now incorrect comment regarding port 5 - set PLL frequency and trgmii only when trgmii is used - eth: mtk_eth_soc: reset PCS state when changing interface types Misc: - ynl: another license adjustment - move the TCA_EXT_WARN_MSG attribute for tc action" * tag 'net-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (108 commits) selftests: bonding: add tests for ether type changes bonding: restore bond's IFF_SLAVE flag if a non-eth dev enslave fails bonding: restore IFF_MASTER/SLAVE flags on bond enslave ether type change net: renesas: rswitch: Fix GWTSDIE register handling net: renesas: rswitch: Fix the output value of quote from rswitch_rx() ethernet: sun: add check for the mdesc_grab() net: ipa: fix some register validity checks net: ipa: kill FILT_ROUT_CACHE_CFG IPA register net: ipa: add two missing declarations net: ipa: reg: include <linux/bug.h> net: xdp: don't call notifiers during driver init net/sched: act_api: add specific EXT_WARN_MSG for tc action Revert "net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy" net: dsa: microchip: fix RGMII delay configuration on KSZ8765/KSZ8794/KSZ8795 ynl: make the tooling check the license ynl: broaden the license even more tools: ynl: make definitions optional again hsr: ratelimit only when errors are printed qed/qed_mng_tlv: correctly zero out ->min instead of ->hour selftests: net: devlink_port_split.py: skip test if no suitable device available ...
2 parents 8d3c682 + f5e305e commit 478a351

132 files changed

Lines changed: 1328 additions & 673 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.mailmap‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,9 @@ Jens Axboe <[email protected]>
215215
Jens Osterkamp <[email protected]>
216216
Jernej Skrabec <[email protected]> <[email protected]>
217217
Jessica Zhang <[email protected]> <[email protected]>
218+
Jiri Pirko <[email protected]> <[email protected]>
219+
Jiri Pirko <[email protected]> <[email protected]>
220+
Jiri Pirko <[email protected]> <[email protected]>
218221
Jiri Slaby <[email protected]> <[email protected]>
219222
Jiri Slaby <[email protected]> <[email protected]>
220223
Jiri Slaby <[email protected]> <[email protected]>

‎Documentation/netlink/genetlink-c.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
1+
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
22
%YAML 1.2
33
---
44
$id: http://kernel.org/schemas/netlink/genetlink-c.yaml#

‎Documentation/netlink/genetlink-legacy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
1+
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
22
%YAML 1.2
33
---
44
$id: http://kernel.org/schemas/netlink/genetlink-legacy.yaml#

‎Documentation/netlink/genetlink.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
1+
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
22
%YAML 1.2
33
---
44
$id: http://kernel.org/schemas/netlink/genetlink-legacy.yaml#

‎Documentation/netlink/specs/ethtool.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
1+
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
22

33
name: ethtool
44

‎Documentation/netlink/specs/fou.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
1+
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
22

33
name: fou
44

‎Documentation/netlink/specs/netdev.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
1+
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
22

33
name: netdev
44

@@ -9,6 +9,7 @@ definitions:
99
-
1010
type: flags
1111
name: xdp-act
12+
render-max: true
1213
entries:
1314
-
1415
name: basic

‎Documentation/userspace-api/netlink/specs.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ YAML specifications can be found under ``Documentation/netlink/specs/``
2424
This document describes details of the schema.
2525
See :doc:`intro-specs` for a practical starting guide.
2626

27-
All specs must be licensed under ``GPL-2.0-only OR BSD-3-Clause``
27+
All specs must be licensed under
28+
``((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)``
2829
to allow for easy adoption in user space code.
2930

3031
Compatibility levels

‎MAINTAINERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5971,7 +5971,7 @@ F: include/linux/dm-*.h
59715971
F: include/uapi/linux/dm-*.h
59725972

59735973
DEVLINK
5974-
M: Jiri Pirko <jiri@nvidia.com>
5974+
M: Jiri Pirko <jiri@resnulli.us>
59755975
L: [email protected]
59765976
S: Supported
59775977
F: Documentation/networking/devlink
@@ -15079,7 +15079,7 @@ F: Documentation/hwmon/nzxt-smart2.rst
1507915079
F: drivers/hwmon/nzxt-smart2.c
1508015080

1508115081
OBJAGG
15082-
M: Jiri Pirko <jiri@nvidia.com>
15082+
M: Jiri Pirko <jiri@resnulli.us>
1508315083
L: [email protected]
1508415084
S: Supported
1508515085
F: include/linux/objagg.h
@@ -15853,7 +15853,7 @@ F: drivers/video/logo/logo_parisc*
1585315853
F: include/linux/hp_sdc.h
1585415854

1585515855
PARMAN
15856-
M: Jiri Pirko <jiri@nvidia.com>
15856+
M: Jiri Pirko <jiri@resnulli.us>
1585715857
L: [email protected]
1585815858
S: Supported
1585915859
F: include/linux/parman.h

‎drivers/net/bonding/bond_main.c‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,6 +1775,19 @@ void bond_lower_state_changed(struct slave *slave)
17751775
slave_err(bond_dev, slave_dev, "Error: %s\n", errmsg); \
17761776
} while (0)
17771777

1778+
/* The bonding driver uses ether_setup() to convert a master bond device
1779+
* to ARPHRD_ETHER, that resets the target netdevice's flags so we always
1780+
* have to restore the IFF_MASTER flag, and only restore IFF_SLAVE if it was set
1781+
*/
1782+
static void bond_ether_setup(struct net_device *bond_dev)
1783+
{
1784+
unsigned int slave_flag = bond_dev->flags & IFF_SLAVE;
1785+
1786+
ether_setup(bond_dev);
1787+
bond_dev->flags |= IFF_MASTER | slave_flag;
1788+
bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;
1789+
}
1790+
17781791
/* enslave device <slave> to bond device <master> */
17791792
int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
17801793
struct netlink_ext_ack *extack)
@@ -1866,10 +1879,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
18661879

18671880
if (slave_dev->type != ARPHRD_ETHER)
18681881
bond_setup_by_slave(bond_dev, slave_dev);
1869-
else {
1870-
ether_setup(bond_dev);
1871-
bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;
1872-
}
1882+
else
1883+
bond_ether_setup(bond_dev);
18731884

18741885
call_netdevice_notifiers(NETDEV_POST_TYPE_CHANGE,
18751886
bond_dev);
@@ -2289,9 +2300,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
22892300
eth_hw_addr_random(bond_dev);
22902301
if (bond_dev->type != ARPHRD_ETHER) {
22912302
dev_close(bond_dev);
2292-
ether_setup(bond_dev);
2293-
bond_dev->flags |= IFF_MASTER;
2294-
bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;
2303+
bond_ether_setup(bond_dev);
22952304
}
22962305
}
22972306

0 commit comments

Comments
 (0)