Commit 96144c58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from David Miller:

 1) Fix cfg80211 deadlock, from Johannes Berg.

 2) RXRPC fails to send norigications, from David Howells.

 3) MPTCP RM_ADDR parsing has an off by one pointer error, fix from
    Geliang Tang.

 4) Fix crash when using MSG_PEEK with sockmap, from Anny Hu.

 5) The ucc_geth driver needs __netdev_watchdog_up exported, from
    Valentin Longchamp.

 6) Fix hashtable memory leak in dccp, from Wang Hai.

 7) Fix how nexthops are marked as FDB nexthops, from David Ahern.

 8) Fix mptcp races between shutdown and recvmsg, from Paolo Abeni.

 9) Fix crashes in tipc_disc_rcv(), from Tuong Lien.

10) Fix link speed reporting in iavf driver, from Brett Creeley.

11) When a channel is used for XSK and then reused again later for XSK,
    we forget to clear out the relevant data structures in mlx5 which
    causes all kinds of problems. Fix from Maxim Mikityanskiy.

12) Fix memory leak in genetlink, from Cong Wang.

13) Disallow sockmap attachments to UDP sockets, it simply won't work.
    From Lorenz Bauer.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (83 commits)
  net: ethernet: ti: ale: fix allmulti for nu type ale
  net: ethernet: ti: am65-cpsw-nuss: fix ale parameters init
  net: atm: Remove the error message according to the atomic context
  bpf: Undo internal BPF_PROBE_MEM in BPF insns dump
  libbpf: Support pre-initializing .bss global variables
  tools/bpftool: Fix skeleton codegen
  bpf: Fix memlock accounting for sock_hash
  bpf: sockmap: Don't attach programs to UDP sockets
  bpf: tcp: Recv() should return 0 when the peer socket is closed
  ibmvnic: Flush existing work items before device removal
  genetlink: clean up family attributes allocations
  net: ipa: header pad field only valid for AP->modem endpoint
  net: ipa: program upper nibbles of sequencer type
  net: ipa: fix modem LAN RX endpoint id
  net: ipa: program metadata mask differently
  ionic: add pcie_print_link_status
  rxrpc: Fix race between incoming ACK parser and retransmitter
  net/mlx5: E-Switch, Fix some error pointer dereferences
  net/mlx5: Don't fail driver on failure to create debugfs
  net/mlx5e: CT: Fix ipv6 nat header rewrite actions
  ...
parents f82e7b57 bc139119

Documentation/networking/devlink-params-sja1105.txt

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
best_effort_vlan_filtering

			[DEVICE, DRIVER-SPECIFIC]

			Allow plain ETH_P_8021Q headers to be used as DSA tags.

			Benefits:

			- Can terminate untagged traffic over switch net

			  devices even when enslaved to a bridge with

			  vlan_filtering=1.

			- Can terminate VLAN-tagged traffic over switch net

			  devices even when enslaved to a bridge with

			  vlan_filtering=1, with some constraints (no more than

			  7 non-pvid VLANs per user port).

			- Can do QoS based on VLAN PCP and VLAN membership

			  admission control for autonomously forwarded frames

			  (regardless of whether they can be terminated on the

			  CPU or not).

			Drawbacks:

			- User cannot use VLANs in range 1024-3071. If the

			  switch receives frames with such VIDs, it will

			  misinterpret them as DSA tags.

			- Switch uses Shared VLAN Learning (FDB lookup uses

			  only DMAC as key).

			- When VLANs span cross-chip topologies, the total

			  number of permitted VLANs may be less than 7 per

			  port, due to a maximum number of 32 VLAN retagging

			  rules per switch.

			Configuration mode: runtime

			Type: bool.

Documentation/networking/devlink/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -40,5 +40,6 @@ parameters, info versions, and other features it supports. 
   mv88e6xxx

   netdevsim

   nfp

   sja1105

   qed

   ti-cpsw-switch

Documentation/networking/devlink/sja1105.rst

0 → 100644
+49 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



=======================

sja1105 devlink support

=======================



This document describes the devlink features implemented

by the ``sja1105`` device driver.



Parameters

==========



.. list-table:: Driver-specific parameters implemented

  :widths: 5 5 5 85



  * - Name

    - Type

    - Mode

    - Description

  * - ``best_effort_vlan_filtering``

    - Boolean

    - runtime

    - Allow plain ETH_P_8021Q headers to be used as DSA tags.



      Benefits:



      - Can terminate untagged traffic over switch net

        devices even when enslaved to a bridge with

        vlan_filtering=1.

      - Can terminate VLAN-tagged traffic over switch net

        devices even when enslaved to a bridge with

        vlan_filtering=1, with some constraints (no more than

        7 non-pvid VLANs per user port).

      - Can do QoS based on VLAN PCP and VLAN membership

        admission control for autonomously forwarded frames

        (regardless of whether they can be terminated on the

        CPU or not).



      Drawbacks:



      - User cannot use VLANs in range 1024-3071. If the

	switch receives frames with such VIDs, it will

	misinterpret them as DSA tags.

      - Switch uses Shared VLAN Learning (FDB lookup uses

	only DMAC as key).

      - When VLANs span cross-chip topologies, the total

	number of permitted VLANs may be less than 7 per

	port, due to a maximum number of 32 VLAN retagging

	rules per switch.

Documentation/networking/dsa/sja1105.rst

+4 −2
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ switch. 


In this case, SJA1105 switch 1 consumes a total of 11 retagging entries, as

follows:



- 8 retagging entries for VLANs 1 and 100 installed on its user ports

  (``sw1p0`` - ``sw1p3``)

- 3 retagging entries for VLAN 100 installed on the user ports of SJA1105
@@ -249,6 +250,7 @@ follows: 
  reverse retagging.



SJA1105 switch 2 also consumes 11 retagging entries, but organized as follows:



- 7 retagging entries for the bridge VLANs on its user ports (``sw2p0`` -

  ``sw2p3``).

- 4 retagging entries for VLAN 100 installed on the user ports of SJA1105

Documentation/networking/mac80211-injection.rst

+1 −1
Original line number Diff line number Diff line
@@ -101,6 +101,6 @@ interface), along the following lines::: 


You can also find a link to a complete inject application here:



http://wireless.kernel.org/en/users/Documentation/packetspammer

https://wireless.wiki.kernel.org/en/users/Documentation/packetspammer



Andy Green <andy@warmcat.com>

CRA Git | Maintained and supported by SUSTech CRA and CCSE