Commit 1b64b2e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) Fix RCU locaking in iwlwifi, from Johannes Berg.

 2) mt76 can access uninitialized NAPI struct, from Felix Fietkau.

 3) Fix race in updating pause settings in bnxt_en, from Vasundhara
    Volam.

 4) Propagate error return properly during unbind failures in ax88172a,
    from George Kennedy.

 5) Fix memleak in adf7242_probe, from Liu Jian.

 6) smc_drv_probe() can leak, from Wang Hai.

 7) Don't muck with the carrier state if register_netdevice() fails in
    the bonding driver, from Taehee Yoo.

 8) Fix memleak in dpaa_eth_probe, from Liu Jian.

 9) Need to check skb_put_padto() return value in hsr_fill_tag(), from
    Murali Karicheri.

10) Don't lose ionic RSS hash settings across FW update, from Shannon
    Nelson.

11) Fix clobbered SKB control block in act_ct, from Wen Xu.

12) Missing newlink in "tx_timeout" sysfs output, from Xiongfeng Wang.

13) IS_UDPLITE cleanup a long time ago, incorrectly handled
    transformations involving UDPLITE_RECV_CC. From Miaohe Lin.

14) Unbalanced locking in netdevsim, from Taehee Yoo.

15) Suppress false-positive error messages in qed driver, from Alexander
    Lobakin.

16) Out of bounds read in ax25_connect and ax25_sendmsg, from Peilin Ye.

17) Missing SKB release in cxgb4's uld_send(), from Navid Emamdoost.

18) Uninitialized value in geneve_changelink(), from Cong Wang.

19) Fix deadlock in xen-netfront, from Andera Righi.

19) flush_backlog() frees skbs with IRQs disabled, so should use
    dev_kfree_skb_irq() instead of kfree_skb(). From Subash Abhinov
    Kasiviswanathan.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (111 commits)
  drivers/net/wan: lapb: Corrected the usage of skb_cow
  dev: Defer free of skbs in flush_backlog
  qrtr: orphan socket in qrtr_release()
  xen-netfront: fix potential deadlock in xennet_remove()
  flow_offload: Move rhashtable inclusion to the source file
  geneve: fix an uninitialized value in geneve_changelink()
  bonding: check return value of register_netdevice() in bond_newlink()
  tcp: allow at most one TLP probe per flight
  AX.25: Prevent integer overflows in connect and sendmsg
  cxgb4: add missing release on skb in uld_send()
  net: atlantic: fix PTP on AQC10X
  AX.25: Prevent out-of-bounds read in ax25_sendmsg()
  sctp: shrink stream outq when fails to do addstream reconf
  sctp: shrink stream outq only when new outcnt < old outcnt
  AX.25: Fix out-of-bounds read in ax25_connect()
  enetc: Remove the mdio bus on PF probe bailout
  net: ethernet: ti: add NETIF_F_HW_TC hw feature flag for taprio offload
  net: ethernet: ave: Fix error returns in ave_init
  drivers/net/wan/x25_asy: Fix to make it work
  ipvs: fix the connection sync failed in some cases
  ...
parents 23ee3e4e 8754e137

Documentation/driver-api/ptp.rst

+12 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ PTP hardware clock infrastructure for Linux 
  + Ancillary clock features

    - Time stamp external events

    - Period output signals configurable from user space

    - Low Pass Filter (LPF) access from user space

    - Synchronization of the Linux system time via the PPS subsystem



PTP hardware clock kernel API
@@ -94,3 +95,14 @@ Supported hardware 


     - Auxiliary Slave/Master Mode Snapshot (optional interrupt)

     - Target Time (optional interrupt)



   * Renesas (IDT) ClockMatrix™



     - Up to 4 independent PHC channels

     - Integrated low pass filter (LPF), access via .adjPhase (compliant to ITU-T G.8273.2)

     - Programmable output periodic signals

     - Programmable inputs can time stamp external triggers

     - Driver and/or hardware configuration through firmware (idtcm.bin)

          - LPF settings (bandwidth, phase limiting, automatic holdover, physical layer assist (per ITU-T G.8273.2))

          - Programmable output PTP clocks, any frequency up to 1GHz (to other PHY/MAC time stampers, refclk to ASSPs/SoCs/FPGAs)

          - Lock to GNSS input, automatic switching between GNSS and user-space PHC control (optional)

Documentation/networking/bareudp.rst

+13 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ Usage 


1) Device creation & deletion



    a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype 0x8847.

    a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype mpls_uc



       This creates a bareudp tunnel device which tunnels L3 traffic with ethertype

       0x8847 (MPLS traffic). The destination port of the UDP header will be set to
@@ -34,14 +34,21 @@ Usage 


    b) ip link delete bareudp0



2) Device creation with multiple proto mode enabled

2) Device creation with multiproto mode enabled



There are two ways to create a bareudp device for MPLS & IP with multiproto mode

enabled.

The multiproto mode allows bareudp tunnels to handle several protocols of the

same family. It is currently only available for IP and MPLS. This mode has to

be enabled explicitly with the "multiproto" flag.



    a) ip link add dev  bareudp0 type bareudp dstport 6635 ethertype 0x8847 multiproto

    a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype ipv4 multiproto



    b) ip link add dev  bareudp0 type bareudp dstport 6635 ethertype mpls

       For an IPv4 tunnel the multiproto mode allows the tunnel to also handle

       IPv6.



    b) ip link add dev bareudp0 type bareudp dstport 6635 ethertype mpls_uc multiproto



       For MPLS, the multiproto mode allows the tunnel to handle both unicast

       and multicast MPLS packets.



3) Device Usage

arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts

+1 −4
Original line number Diff line number Diff line
@@ -454,10 +454,7 @@ 
	status = "okay";

	phy-mode = "2500base-x";

	phys = <&cp1_comphy5 2>;

	fixed-link {

		speed = <2500>;

		full-duplex;

	};

	managed = "in-band-status";

};



&cp1_spi1 {

drivers/crypto/chelsio/chtls/chtls_cm.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static struct net_device *chtls_find_netdev(struct chtls_dev *cdev, 
	case PF_INET:

		if (likely(!inet_sk(sk)->inet_rcv_saddr))

			return ndev;

		ndev = ip_dev_find(&init_net, inet_sk(sk)->inet_rcv_saddr);

		ndev = __ip_dev_find(&init_net, inet_sk(sk)->inet_rcv_saddr, false);

		break;

#if IS_ENABLED(CONFIG_IPV6)

	case PF_INET6:

drivers/crypto/chelsio/chtls/chtls_io.c

+4 −3
Original line number Diff line number Diff line
@@ -1052,14 +1052,15 @@ int chtls_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) 
							  &record_type);

				if (err)

					goto out_err;



				/* Avoid appending tls handshake, alert to tls data */

				if (skb)

					tx_skb_finalize(skb);

			}



			recordsz = size;

			csk->tlshws.txleft = recordsz;

			csk->tlshws.type = record_type;



			if (skb)

				ULP_SKB_CB(skb)->ulp.tls.type = record_type;

		}



		if (!skb || (ULP_SKB_CB(skb)->flags & ULPCB_FLAG_NO_APPEND) ||

CRA Git | Maintained and supported by SUSTech CRA and CCSE