Skip to content

Commit 249aca0

Browse files
torvaldstorvalds
committed
Merge tag 'net-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Including fixes from bluetooth, bpf and netfilter. Current release - new code bugs: - bridge: switchdev: check br_vlan_group() return value - use this_cpu_inc() to increment net->core_stats, fix preempt-rt Previous releases - regressions: - eth: stmmac: fix write to sgmii_adapter_base Previous releases - always broken: - netfilter: nf_conntrack_tcp: re-init for syn packets only, resolving issues with TCP fastopen - tcp: md5: fix incorrect tcp_header_len for incoming connections - tcp: fix F-RTO may not work correctly when receiving DSACK - tcp: ensure use of most recently sent skb when filling rate samples - tcp: fix potential xmit stalls caused by TCP_NOTSENT_LOWAT - virtio_net: fix wrong buf address calculation when using xdp - xsk: fix forwarding when combining copy mode with busy poll - xsk: fix possible crash when multiple sockets are created - bpf: lwt: fix crash when using bpf_skb_set_tunnel_key() from bpf_xmit lwt hook - sctp: null-check asoc strreset_chunk in sctp_generate_reconf_event - wireguard: device: check for metadata_dst with skb_valid_dst() - netfilter: update ip6_route_me_harder to consider L3 domain - gre: make o_seqno start from 0 in native mode - gre: switch o_seqno to atomic to prevent races in collect_md mode Misc: - add Eric Dumazet to networking maintainers - dt: dsa: realtek: remove realtek,rtl8367s string - netfilter: flowtable: Remove the empty file" * tag 'net-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (65 commits) tcp: fix F-RTO may not work correctly when receiving DSACK Revert "ibmvnic: Add ethtool private flag for driver-defined queue limits" net: enetc: allow tc-etf offload even with NETIF_F_CSUM_MASK ixgbe: ensure IPsec VF<->PF compatibility MAINTAINERS: Update BNXT entry with firmware files netfilter: nft_socket: only do sk lookups when indev is available net: fec: add missing of_node_put() in fec_enet_init_stop_mode() bnx2x: fix napi API usage sequence tls: Skip tls_append_frag on zero copy size Add Eric Dumazet to networking maintainers netfilter: conntrack: fix udp offload timeout sysctl netfilter: nf_conntrack_tcp: re-init for syn packets only net: dsa: lantiq_gswip: Don't set GSWIP_MII_CFG_RMII_CLK net: Use this_cpu_inc() to increment net->core_stats Bluetooth: hci_sync: Cleanup hci_conn if it cannot be aborted Bluetooth: hci_event: Fix creating hci_conn object on error status Bluetooth: hci_event: Fix checking for invalid handle on error status ice: fix use-after-free when deinitializing mailbox snapshot ice: wait 5 s for EMP reset after firmware flash ice: Protect vf_state check by cfg_lock in ice_vc_process_vf_msg() ...
2 parents 3c76fe7 + d9157f6 commit 249aca0

Some content is hidden

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

70 files changed

+598
-414
lines changed

‎Documentation/devicetree/bindings/net/dsa/realtek.yaml

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,32 +27,25 @@ description:
2727
The realtek-mdio driver is an MDIO driver and it must be inserted inside
2828
an MDIO node.
2929

30+
The compatible string is only used to identify which (silicon) family the
31+
switch belongs to. Roughly speaking, a family is any set of Realtek switches
32+
whose chip identification register(s) have a common location and semantics.
33+
The different models in a given family can be automatically disambiguated by
34+
parsing the chip identification register(s) according to the given family,
35+
avoiding the need for a unique compatible string for each model.
36+
3037
properties:
3138
compatible:
3239
enum:
3340
- realtek,rtl8365mb
34-
- realtek,rtl8366
3541
- realtek,rtl8366rb
36-
- realtek,rtl8366s
37-
- realtek,rtl8367
38-
- realtek,rtl8367b
39-
- realtek,rtl8367rb
40-
- realtek,rtl8367s
41-
- realtek,rtl8368s
42-
- realtek,rtl8369
43-
- realtek,rtl8370
4442
description: |
45-
realtek,rtl8365mb: 4+1 ports
46-
realtek,rtl8366: 5+1 ports
47-
realtek,rtl8366rb: 5+1 ports
48-
realtek,rtl8366s: 5+1 ports
49-
realtek,rtl8367:
50-
realtek,rtl8367b:
51-
realtek,rtl8367rb: 5+2 ports
52-
realtek,rtl8367s: 5+2 ports
53-
realtek,rtl8368s: 8 ports
54-
realtek,rtl8369: 8+1 ports
55-
realtek,rtl8370: 8+2 ports
43+
realtek,rtl8365mb:
44+
Use with models RTL8363NB, RTL8363NB-VB, RTL8363SC, RTL8363SC-VB,
45+
RTL8364NB, RTL8364NB-VB, RTL8365MB, RTL8366SC, RTL8367RB-VB, RTL8367S,
46+
RTL8367SB, RTL8370MB, RTL8310SR
47+
realtek,rtl8366rb:
48+
Use with models RTL8366RB, RTL8366S
5649
5750
mdc-gpios:
5851
description: GPIO line for the MDC clock line.
@@ -335,7 +328,7 @@ examples:
335328
#size-cells = <0>;
336329
337330
switch@29 {
338-
compatible = "realtek,rtl8367s";
331+
compatible = "realtek,rtl8365mb";
339332
reg = <29>;
340333
341334
reset-gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;

‎MAINTAINERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3913,7 +3913,9 @@ BROADCOM BNXT_EN 50 GIGABIT ETHERNET DRIVER
39133913
M: Michael Chan <[email protected]>
39143914
L: [email protected]
39153915
S: Supported
3916+
F: drivers/firmware/broadcom/tee_bnxt_fw.c
39163917
F: drivers/net/ethernet/broadcom/bnxt/
3918+
F: include/linux/firmware/broadcom/tee_bnxt_fw.h
39173919

39183920
BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
39193921
M: Arend van Spriel <[email protected]>
@@ -13623,6 +13625,7 @@ F: net/core/drop_monitor.c
1362313625

1362413626
NETWORKING DRIVERS
1362513627
M: "David S. Miller" <[email protected]>
13628+
M: Eric Dumazet <[email protected]>
1362613629
M: Jakub Kicinski <[email protected]>
1362713630
M: Paolo Abeni <[email protected]>
1362813631
L: [email protected]
@@ -13670,6 +13673,7 @@ F: tools/testing/selftests/drivers/net/dsa/
1367013673

1367113674
NETWORKING [GENERAL]
1367213675
M: "David S. Miller" <[email protected]>
13676+
M: Eric Dumazet <[email protected]>
1367313677
M: Jakub Kicinski <[email protected]>
1367413678
M: Paolo Abeni <[email protected]>
1367513679
L: [email protected]

‎drivers/net/dsa/lantiq_gswip.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1681,9 +1681,6 @@ static void gswip_phylink_mac_config(struct dsa_switch *ds, int port,
16811681
break;
16821682
case PHY_INTERFACE_MODE_RMII:
16831683
miicfg |= GSWIP_MII_CFG_MODE_RMIIM;
1684-
1685-
/* Configure the RMII clock as output: */
1686-
miicfg |= GSWIP_MII_CFG_RMII_CLK;
16871684
break;
16881685
case PHY_INTERFACE_MODE_RGMII:
16891686
case PHY_INTERFACE_MODE_RGMII_ID:

‎drivers/net/dsa/mv88e6xxx/port_hidden.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ int mv88e6xxx_port_hidden_wait(struct mv88e6xxx_chip *chip)
4040
{
4141
int bit = __bf_shf(MV88E6XXX_PORT_RESERVED_1A_BUSY);
4242

43-
return mv88e6xxx_wait_bit(chip, MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT,
44-
MV88E6XXX_PORT_RESERVED_1A, bit, 0);
43+
return mv88e6xxx_port_wait_bit(chip,
44+
MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT,
45+
MV88E6XXX_PORT_RESERVED_1A, bit, 0);
4546
}
4647

4748
int mv88e6xxx_port_hidden_read(struct mv88e6xxx_chip *chip, int block, int port,

‎drivers/net/dsa/realtek/realtek-mdio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ static const struct of_device_id realtek_mdio_of_match[] = {
267267
#endif
268268
#if IS_ENABLED(CONFIG_NET_DSA_REALTEK_RTL8365MB)
269269
{ .compatible = "realtek,rtl8365mb", .data = &rtl8365mb_variant, },
270-
{ .compatible = "realtek,rtl8367s", .data = &rtl8365mb_variant, },
271270
#endif
272271
{ /* sentinel */ },
273272
};

‎drivers/net/dsa/realtek/realtek-smi.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,10 +551,6 @@ static const struct of_device_id realtek_smi_of_match[] = {
551551
.compatible = "realtek,rtl8365mb",
552552
.data = &rtl8365mb_variant,
553553
},
554-
{
555-
.compatible = "realtek,rtl8367s",
556-
.data = &rtl8365mb_variant,
557-
},
558554
#endif
559555
{ /* sentinel */ },
560556
};

‎drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14153,10 +14153,6 @@ static int bnx2x_eeh_nic_unload(struct bnx2x *bp)
1415314153

1415414154
/* Stop Tx */
1415514155
bnx2x_tx_disable(bp);
14156-
/* Delete all NAPI objects */
14157-
bnx2x_del_all_napi(bp);
14158-
if (CNIC_LOADED(bp))
14159-
bnx2x_del_all_napi_cnic(bp);
1416014156
netdev_reset_tc(bp->dev);
1416114157

1416214158
del_timer_sync(&bp->timer);
@@ -14261,6 +14257,11 @@ static pci_ers_result_t bnx2x_io_slot_reset(struct pci_dev *pdev)
1426114257
bnx2x_drain_tx_queues(bp);
1426214258
bnx2x_send_unload_req(bp, UNLOAD_RECOVERY);
1426314259
bnx2x_netif_stop(bp, 1);
14260+
bnx2x_del_all_napi(bp);
14261+
14262+
if (CNIC_LOADED(bp))
14263+
bnx2x_del_all_napi_cnic(bp);
14264+
1426414265
bnx2x_free_irq(bp);
1426514266

1426614267
/* Report UNLOAD_DONE to MCP */

‎drivers/net/ethernet/broadcom/genet/bcmgenet.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2035,6 +2035,11 @@ static struct sk_buff *bcmgenet_add_tsb(struct net_device *dev,
20352035
return skb;
20362036
}
20372037

2038+
static void bcmgenet_hide_tsb(struct sk_buff *skb)
2039+
{
2040+
__skb_pull(skb, sizeof(struct status_64));
2041+
}
2042+
20382043
static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
20392044
{
20402045
struct bcmgenet_priv *priv = netdev_priv(dev);
@@ -2141,6 +2146,8 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
21412146
}
21422147

21432148
GENET_CB(skb)->last_cb = tx_cb_ptr;
2149+
2150+
bcmgenet_hide_tsb(skb);
21442151
skb_tx_timestamp(skb);
21452152

21462153
/* Decrement total BD count and advance our write pointer */

‎drivers/net/ethernet/freescale/enetc/enetc_qos.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,10 +297,6 @@ int enetc_setup_tc_txtime(struct net_device *ndev, void *type_data)
297297
if (tc < 0 || tc >= priv->num_tx_rings)
298298
return -EINVAL;
299299

300-
/* Do not support TXSTART and TX CSUM offload simutaniously */
301-
if (ndev->features & NETIF_F_CSUM_MASK)
302-
return -EBUSY;
303-
304300
/* TSD and Qbv are mutually exclusive in hardware */
305301
if (enetc_rd(&priv->si->hw, ENETC_QBV_PTGCR_OFFSET) & ENETC_QBV_TGE)
306302
return -EBUSY;

‎drivers/net/ethernet/freescale/fec_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3731,7 +3731,7 @@ static int fec_enet_init_stop_mode(struct fec_enet_private *fep,
37313731
ARRAY_SIZE(out_val));
37323732
if (ret) {
37333733
dev_dbg(&fep->pdev->dev, "no stop mode property\n");
3734-
return ret;
3734+
goto out;
37353735
}
37363736

37373737
fep->stop_gpr.gpr = syscon_node_to_regmap(gpr_np);

0 commit comments

Comments
 (0)