Skip to content

Commit bbe2ba0

Browse files
torvaldstorvalds
committed
Merge tag 'net-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Networking fixes for 5.10-rc7, including fixes from bpf, netfilter, wireless drivers, wireless mesh and can. Current release - regressions: - mt76: usb: fix crash on device removal Current release - always broken: - xsk: Fix umem cleanup from wrong context in socket destruct Previous release - regressions: - net: ip6_gre: set dev->hard_header_len when using header_ops - ipv4: Fix TOS mask in inet_rtm_getroute() - net, xsk: Avoid taking multiple skbuff references Previous release - always broken: - net/x25: prevent a couple of overflows - netfilter: ipset: prevent uninit-value in hash_ip6_add - geneve: pull IP header before ECN decapsulation - mpls: ensure LSE is pullable in TC and openvswitch paths - vxlan: respect needed_headroom of lower device - batman-adv: Consider fragmentation for needed packet headroom - can: drivers: don't count arbitration loss as an error - netfilter: bridge: reset skb->pkt_type after POST_ROUTING traversal - inet_ecn: Fix endianness of checksum update when setting ECT(1) - ibmvnic: fix various corner cases around reset handling - net/mlx5: fix rejecting unsupported Connect-X6DX SW steering - net/mlx5: Enforce HW TX csum offload with kTLS" * tag 'net-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (62 commits) net/mlx5: DR, Proper handling of unsupported Connect-X6DX SW steering net/mlx5e: kTLS, Enforce HW TX csum offload with kTLS net: mlx5e: fix fs_tcp.c build when IPV6 is not enabled net/mlx5: Fix wrong address reclaim when command interface is down net/sched: act_mpls: ensure LSE is pullable before reading it net: openvswitch: ensure LSE is pullable before reading it net: skbuff: ensure LSE is pullable before decrementing the MPLS ttl net: mvpp2: Fix error return code in mvpp2_open() chelsio/chtls: fix a double free in chtls_setkey() rtw88: debug: Fix uninitialized memory in debugfs code vxlan: fix error return code in __vxlan_dev_create() net: pasemi: fix error return code in pasemi_mac_open() cxgb3: fix error return code in t3_sge_alloc_qset() net/x25: prevent a couple of overflows dpaa_eth: copy timestamp fields to new skb in A-050385 workaround net: ip6_gre: set dev->hard_header_len when using header_ops mt76: usb: fix crash on device removal iwlwifi: pcie: add some missing entries for AX210 iwlwifi: pcie: invert values of NO_160 device config entries iwlwifi: pcie: add one missing entry for AX210 ...
2 parents fee5be1 + 6f076ce commit bbe2ba0

59 files changed

Lines changed: 496 additions & 199 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.

‎Documentation/devicetree/bindings/net/can/tcan4x5x.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ tcan4x5x: tcan4x5x@0 {
3333
spi-max-frequency = <10000000>;
3434
bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;
3535
interrupt-parent = <&gpio1>;
36-
interrupts = <14 GPIO_ACTIVE_LOW>;
36+
interrupts = <14 IRQ_TYPE_LEVEL_LOW>;
3737
device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
3838
device-wake-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
3939
reset-gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>;

‎Documentation/devicetree/bindings/net/nfc/nxp-nci.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Example (for ARM-based BeagleBone with NPC100 NFC controller on I2C2):
2525
clock-frequency = <100000>;
2626

2727
interrupt-parent = <&gpio1>;
28-
interrupts = <29 GPIO_ACTIVE_HIGH>;
28+
interrupts = <29 IRQ_TYPE_LEVEL_HIGH>;
2929

3030
enable-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
3131
firmware-gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;

‎Documentation/devicetree/bindings/net/nfc/pn544.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Example (for ARM-based BeagleBone with PN544 on I2C2):
2525
clock-frequency = <400000>;
2626

2727
interrupt-parent = <&gpio1>;
28-
interrupts = <17 GPIO_ACTIVE_HIGH>;
28+
interrupts = <17 IRQ_TYPE_LEVEL_HIGH>;
2929

3030
enable-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
3131
firmware-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;

‎MAINTAINERS‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3357,6 +3357,17 @@ S: Supported
33573357
F: arch/x86/net/
33583358
X: arch/x86/net/bpf_jit_comp32.c
33593359

3360+
BPF LSM (Security Audit and Enforcement using BPF)
3361+
M: KP Singh <kpsingh@chromium.org>
3362+
R: Florent Revest <revest@chromium.org>
3363+
R: Brendan Jackman <jackmanb@chromium.org>
3364+
L: bpf@vger.kernel.org
3365+
S: Maintained
3366+
F: Documentation/bpf/bpf_lsm.rst
3367+
F: include/linux/bpf_lsm.h
3368+
F: kernel/bpf/bpf_lsm.c
3369+
F: security/bpf/
3370+
33603371
BROADCOM B44 10/100 ETHERNET DRIVER
33613372
M: Michael Chan <michael.chan@broadcom.com>
33623373
L: netdev@vger.kernel.org
@@ -9069,10 +9080,7 @@ S: Supported
90699080
F: drivers/net/wireless/intel/iwlegacy/
90709081

90719082
INTEL WIRELESS WIFI LINK (iwlwifi)
9072-
M: Johannes Berg <johannes.berg@intel.com>
9073-
M: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
90749083
M: Luca Coelho <luciano.coelho@intel.com>
9075-
M: Intel Linux Wireless <linuxwifi@intel.com>
90769084
L: linux-wireless@vger.kernel.org
90779085
S: Supported
90789086
W: https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
@@ -19114,12 +19122,17 @@ L: netdev@vger.kernel.org
1911419122
L: bpf@vger.kernel.org
1911519123
S: Supported
1911619124
F: include/net/xdp.h
19125+
F: include/net/xdp_priv.h
1911719126
F: include/trace/events/xdp.h
1911819127
F: kernel/bpf/cpumap.c
1911919128
F: kernel/bpf/devmap.c
1912019129
F: net/core/xdp.c
19121-
N: xdp
19122-
K: xdp
19130+
F: samples/bpf/xdp*
19131+
F: tools/testing/selftests/bpf/*xdp*
19132+
F: tools/testing/selftests/bpf/*/*xdp*
19133+
F: drivers/net/ethernet/*/*/*/*/*xdp*
19134+
F: drivers/net/ethernet/*/*/*xdp*
19135+
K: (?:\b|_)xdp(?:\b|_)
1912319136

1912419137
XDP SOCKETS (AF_XDP)
1912519138
M: Björn Töpel <bjorn.topel@intel.com>
@@ -19128,9 +19141,12 @@ R: Jonathan Lemon <jonathan.lemon@gmail.com>
1912819141
L: netdev@vger.kernel.org
1912919142
L: bpf@vger.kernel.org
1913019143
S: Maintained
19144+
F: Documentation/networking/af_xdp.rst
1913119145
F: include/net/xdp_sock*
1913219146
F: include/net/xsk_buff_pool.h
1913319147
F: include/uapi/linux/if_xdp.h
19148+
F: include/uapi/linux/xdp_diag.h
19149+
F: include/net/netns/xdp.h
1913419150
F: net/xdp/
1913519151
F: samples/bpf/xdpsock*
1913619152
F: tools/lib/bpf/xsk*

‎drivers/net/can/c_can/c_can.c‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,12 +1295,22 @@ int c_can_power_up(struct net_device *dev)
12951295
time_after(time_out, jiffies))
12961296
cpu_relax();
12971297

1298-
if (time_after(jiffies, time_out))
1299-
return -ETIMEDOUT;
1298+
if (time_after(jiffies, time_out)) {
1299+
ret = -ETIMEDOUT;
1300+
goto err_out;
1301+
}
13001302

13011303
ret = c_can_start(dev);
1302-
if (!ret)
1303-
c_can_irq_control(priv, true);
1304+
if (ret)
1305+
goto err_out;
1306+
1307+
c_can_irq_control(priv, true);
1308+
1309+
return 0;
1310+
1311+
err_out:
1312+
c_can_reset_ram(priv, false);
1313+
c_can_pm_runtime_put_sync(priv);
13041314

13051315
return ret;
13061316
}

‎drivers/net/can/kvaser_pciefd.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,8 +692,10 @@ static int kvaser_pciefd_open(struct net_device *netdev)
692692
return err;
693693

694694
err = kvaser_pciefd_bus_on(can);
695-
if (err)
695+
if (err) {
696+
close_candev(netdev);
696697
return err;
698+
}
697699

698700
return 0;
699701
}

‎drivers/net/can/m_can/tcan4x5x.c‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -489,18 +489,18 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
489489
spi->bits_per_word = 32;
490490
ret = spi_setup(spi);
491491
if (ret)
492-
goto out_clk;
492+
goto out_m_can_class_free_dev;
493493

494494
priv->regmap = devm_regmap_init(&spi->dev, &tcan4x5x_bus,
495495
&spi->dev, &tcan4x5x_regmap);
496496
if (IS_ERR(priv->regmap)) {
497497
ret = PTR_ERR(priv->regmap);
498-
goto out_clk;
498+
goto out_m_can_class_free_dev;
499499
}
500500

501501
ret = tcan4x5x_power_enable(priv->power, 1);
502502
if (ret)
503-
goto out_clk;
503+
goto out_m_can_class_free_dev;
504504

505505
ret = tcan4x5x_parse_config(mcan_class);
506506
if (ret)
@@ -519,11 +519,6 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
519519

520520
out_power:
521521
tcan4x5x_power_enable(priv->power, 0);
522-
out_clk:
523-
if (!IS_ERR(mcan_class->cclk)) {
524-
clk_disable_unprepare(mcan_class->cclk);
525-
clk_disable_unprepare(mcan_class->hclk);
526-
}
527522
out_m_can_class_free_dev:
528523
m_can_class_free_dev(mcan_class->net);
529524
dev_err(&spi->dev, "Probe failed, err=%d\n", ret);

‎drivers/net/can/sja1000/sja1000.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,6 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
474474
netdev_dbg(dev, "arbitration lost interrupt\n");
475475
alc = priv->read_reg(priv, SJA1000_ALC);
476476
priv->can.can_stats.arbitration_lost++;
477-
stats->tx_errors++;
478477
cf->can_id |= CAN_ERR_LOSTARB;
479478
cf->data[0] = alc & 0x1f;
480479
}

‎drivers/net/can/sun4i_can.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,6 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)
604604
netdev_dbg(dev, "arbitration lost interrupt\n");
605605
alc = readl(priv->base + SUN4I_REG_STA_ADDR);
606606
priv->can.can_stats.arbitration_lost++;
607-
stats->tx_errors++;
608607
if (likely(skb)) {
609608
cf->can_id |= CAN_ERR_LOSTARB;
610609
cf->data[0] = (alc >> 8) & 0x1f;

‎drivers/net/ethernet/broadcom/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ config BNX2
8888
config CNIC
8989
tristate "QLogic CNIC support"
9090
depends on PCI && (IPV6 || IPV6=n)
91+
depends on MMU
9192
select BNX2
9293
select UIO
9394
help

0 commit comments

Comments
 (0)