Commit 42e66b1c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Paolo Abeni:
 "Including fixes from bluetooth, bpf and wireless.

  Current release - regressions:

   - bpf:
      - fix wrong last sg check in sk_msg_recvmsg()
      - fix kernel BUG in purge_effective_progs()

   - mac80211:
      - fix possible leak in ieee80211_tx_control_port()
      - potential NULL dereference in ieee80211_tx_control_port()

  Current release - new code bugs:

   - nfp: fix the access to management firmware hanging

  Previous releases - regressions:

   - ip: fix triggering of 'icmp redirect'

   - sched: tbf: don't call qdisc_put() while holding tree lock

   - bpf: fix corrupted packets for XDP_SHARED_UMEM

   - bluetooth: hci_sync: fix suspend performance regression

   - micrel: fix probe failure

  Previous releases - always broken:

   - tcp: make global challenge ack rate limitation per net-ns and
     default disabled

   - tg3: fix potential hang-up on system reboot

   - mac802154: fix reception for no-daddr packets

  Misc:

   - r8152: add PID for the lenovo onelink+ dock"

* tag 'net-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (56 commits)
  net/smc: Remove redundant refcount increase
  Revert "sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb"
  tcp: make global challenge ack rate limitation per net-ns and default disabled
  tcp: annotate data-race around challenge_timestamp
  net: dsa: hellcreek: Print warning only once
  ip: fix triggering of 'icmp redirect'
  sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb
  selftests: net: sort .gitignore file
  Documentation: networking: correct possessive "its"
  kcm: fix strp_init() order and cleanup
  mlxbf_gige: compute MDIO period based on i1clk
  ethernet: rocker: fix sleep in atomic context bug in neigh_timer_handler
  net: lan966x: improve error handle in lan966x_fdma_rx_get_frame()
  nfp: fix the access to management firmware hanging
  net: phy: micrel: Make the GPIO to be non-exclusive
  net: virtio_net: fix notification coalescing comments
  net/sched: fix netdevice reference leaks in attach_default_qdiscs()
  net: sched: tbf: don't call qdisc_put() while holding tree lock
  net: Use u64_stats_fetch_begin_irq() for stats fetch.
  net: dsa: xrs700x: Use irqsave variant for u64 stats update
  ...
parents d330076e a8424a9b

Documentation/networking/devlink/netdevsim.rst

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ The ``netdevsim`` driver supports rate objects management, which includes: 
- setting tx_share and tx_max rate values for any rate object type;

- setting parent node for any rate object type.



Rate nodes and it's parameters are exposed in ``netdevsim`` debugfs in RO mode.

Rate nodes and their parameters are exposed in ``netdevsim`` debugfs in RO mode.

For example created rate node with name ``some_group``:



.. code:: shell

Documentation/networking/driver.rst

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Transmit path guidelines: 


1) The ndo_start_xmit method must not return NETDEV_TX_BUSY under

   any normal circumstances.  It is considered a hard error unless

   there is no way your device can tell ahead of time when it's

   there is no way your device can tell ahead of time when its

   transmit function will become busy.



   Instead it must maintain the queue properly.  For example,

Documentation/networking/ip-sysctl.rst

+4 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,10 @@ tcp_limit_output_bytes - INTEGER 
tcp_challenge_ack_limit - INTEGER

	Limits number of Challenge ACK sent per second, as recommended

	in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks)

	Default: 1000

	Note that this per netns rate limit can allow some side channel

	attacks and probably should not be enabled.

	TCP stack implements per TCP socket limits anyway.

	Default: INT_MAX (unlimited)



UDP variables

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

Documentation/networking/ipvlan.rst

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Initial Release: 
================

This is conceptually very similar to the macvlan driver with one major

exception of using L3 for mux-ing /demux-ing among slaves. This property makes

the master device share the L2 with it's slave devices. I have developed this

the master device share the L2 with its slave devices. I have developed this

driver in conjunction with network namespaces and not sure if there is use case

outside of it.

Documentation/networking/l2tp.rst

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ its tunnel close actions. For L2TPIP sockets, the socket's close 
handler initiates the same tunnel close actions. All sessions are

first closed. Each session drops its tunnel ref. When the tunnel ref

reaches zero, the tunnel puts its socket ref. When the socket is

eventually destroyed, it's sk_destruct finally frees the L2TP tunnel

eventually destroyed, its sk_destruct finally frees the L2TP tunnel

context.



Sessions