Commit 249aca0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
  ...
parents 3c76fe74 d9157f68

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

+14 −21
Original line number Diff line number Diff line
@@ -27,32 +27,25 @@ description: 
  The realtek-mdio driver is an MDIO driver and it must be inserted inside

  an MDIO node.



  The compatible string is only used to identify which (silicon) family the

  switch belongs to. Roughly speaking, a family is any set of Realtek switches

  whose chip identification register(s) have a common location and semantics.

  The different models in a given family can be automatically disambiguated by

  parsing the chip identification register(s) according to the given family,

  avoiding the need for a unique compatible string for each model.



properties:

  compatible:

    enum:

      - realtek,rtl8365mb

      - realtek,rtl8366

      - realtek,rtl8366rb

      - realtek,rtl8366s

      - realtek,rtl8367

      - realtek,rtl8367b

      - realtek,rtl8367rb

      - realtek,rtl8367s

      - realtek,rtl8368s

      - realtek,rtl8369

      - realtek,rtl8370

    description: |

      realtek,rtl8365mb: 4+1 ports

      realtek,rtl8366: 5+1 ports

      realtek,rtl8366rb: 5+1 ports

      realtek,rtl8366s: 5+1 ports

      realtek,rtl8367:

      realtek,rtl8367b:

      realtek,rtl8367rb: 5+2 ports

      realtek,rtl8367s: 5+2 ports

      realtek,rtl8368s: 8 ports

      realtek,rtl8369: 8+1 ports

      realtek,rtl8370: 8+2 ports

      realtek,rtl8365mb:

        Use with models RTL8363NB, RTL8363NB-VB, RTL8363SC, RTL8363SC-VB,

        RTL8364NB, RTL8364NB-VB, RTL8365MB, RTL8366SC, RTL8367RB-VB, RTL8367S,

        RTL8367SB, RTL8370MB, RTL8310SR

      realtek,rtl8366rb:

        Use with models RTL8366RB, RTL8366S



  mdc-gpios:

    description: GPIO line for the MDC clock line.
@@ -335,7 +328,7 @@ examples: 
            #size-cells = <0>;



            switch@29 {

                    compatible = "realtek,rtl8367s";

                    compatible = "realtek,rtl8365mb";

                    reg = <29>;



                    reset-gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -3913,7 +3913,9 @@ BROADCOM BNXT_EN 50 GIGABIT ETHERNET DRIVER 
M:	Michael Chan <michael.chan@broadcom.com>

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/firmware/broadcom/tee_bnxt_fw.c

F:	drivers/net/ethernet/broadcom/bnxt/

F:	include/linux/firmware/broadcom/tee_bnxt_fw.h









BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER









M:	Arend van Spriel <aspriel@gmail.com>








@@ -13623,6 +13625,7 @@ F:	net/core/drop_monitor.c















NETWORKING DRIVERS









M:	"David S. Miller" <davem@davemloft.net>









M:	Eric Dumazet <edumazet@google.com>









M:	Jakub Kicinski <kuba@kernel.org>









M:	Paolo Abeni <pabeni@redhat.com>









L:	netdev@vger.kernel.org








@@ -13670,6 +13673,7 @@ F:	tools/testing/selftests/drivers/net/dsa/















NETWORKING [GENERAL]









M:	"David S. Miller" <davem@davemloft.net>









M:	Eric Dumazet <edumazet@google.com>









M:	Jakub Kicinski <kuba@kernel.org>









M:	Paolo Abeni <pabeni@redhat.com>









L:	netdev@vger.kernel.org
































drivers/net/dsa/lantiq_gswip.c



+0
−3






























Original line number
Diff line number
Diff line







@@ -1681,9 +1681,6 @@ static void gswip_phylink_mac_config(struct dsa_switch *ds, int port,







		break;









	case PHY_INTERFACE_MODE_RMII:









		miicfg |= GSWIP_MII_CFG_MODE_RMIIM;



















		/* Configure the RMII clock as output: */









		miicfg |= GSWIP_MII_CFG_RMII_CLK;









		break;









	case PHY_INTERFACE_MODE_RGMII:









	case PHY_INTERFACE_MODE_RGMII_ID:
































drivers/net/dsa/mv88e6xxx/port_hidden.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -40,7 +40,8 @@ int mv88e6xxx_port_hidden_wait(struct mv88e6xxx_chip *chip)







{









	int bit = __bf_shf(MV88E6XXX_PORT_RESERVED_1A_BUSY);



















	return mv88e6xxx_wait_bit(chip, MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT,









	return mv88e6xxx_port_wait_bit(chip,









				       MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT,









				       MV88E6XXX_PORT_RESERVED_1A, bit, 0);









}










































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



+0
−1






























Original line number
Diff line number
Diff line







@@ -267,7 +267,6 @@ static const struct of_device_id realtek_mdio_of_match[] = {







#endif









#if IS_ENABLED(CONFIG_NET_DSA_REALTEK_RTL8365MB)









	{ .compatible = "realtek,rtl8365mb", .data = &rtl8365mb_variant, },









	{ .compatible = "realtek,rtl8367s", .data = &rtl8365mb_variant, },









#endif









	{ /* sentinel */ },









};