Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a26d99b authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull networking fixes from David Miller:
 "Lots of fixes, mostly drivers as is usually the case.

   1) Don't treat zero DMA address as invalid in vmxnet3, from Alexey
      Khoroshilov.

   2) Fix element timeouts in netfilter's nft_dynset, from Anders K.
      Pedersen.

   3) Don't put aead_req crypto struct on the stack in mac80211, from
      Ard Biesheuvel.

   4) Several uninitialized variable warning fixes from Arnd Bergmann.

   5) Fix memory leak in cxgb4, from Colin Ian King.

   6) Fix bpf handling of VLAN header push/pop, from Daniel Borkmann.

   7) Several VRF semantic fixes from David Ahern.

   8) Set skb->protocol properly in ip6_tnl_xmit(), from Eli Cooper.

   9) Socket needs to be locked in udp_disconnect(), from Eric Dumazet.

  10) Div-by-zero on 32-bit fix in mlx4 driver, from Eugenia Emantayev.

  11) Fix stale link state during failover in NCSCI driver, from Gavin
      Shan.

  12) Fix netdev lower adjacency list traversal, from Ido Schimmel.

  13) Propvide proper handle when emitting notifications of filter
      deletes, from Jamal Hadi Salim.

  14) Memory leaks and big-endian issues in rtl8xxxu, from Jes Sorensen.

  15) Fix DESYNC_FACTOR handling in ipv6, from Jiri Bohac.

  16) Several routing offload fixes in mlxsw driver, from Jiri Pirko.

  17) Fix broadcast sync problem in TIPC, from Jon Paul Maloy.

  18) Validate chunk len before using it in SCTP, from Marcelo Ricardo
      Leitner.

  19) Revert a netns locking change that causes regressions, from Paul
      Moore.

  20) Add recursion limit to GRO handling, from Sabrina Dubroca.

  21) GFP_KERNEL in irq context fix in ibmvnic, from Thomas Falcon.

  22) Avoid accessing stale vxlan/geneve socket in data path, from
      Pravin Shelar"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (189 commits)
  geneve: avoid using stale geneve socket.
  vxlan: avoid using stale vxlan socket.
  qede: Fix out-of-bound fastpath memory access
  net: phy: dp83848: add dp83822 PHY support
  enic: fix rq disable
  tipc: fix broadcast link synchronization problem
  ibmvnic: Fix missing brackets in init_sub_crq_irqs
  ibmvnic: Fix releasing of sub-CRQ IRQs in interrupt context
  Revert "ibmvnic: Fix releasing of sub-CRQ IRQs in interrupt context"
  arch/powerpc: Update parameters for csum_tcpudp_magic & csum_tcpudp_nofold
  net/mlx4_en: Save slave ethtool stats command
  net/mlx4_en: Fix potential deadlock in port statistics flow
  net/mlx4: Fix firmware command timeout during interrupt test
  net/mlx4_core: Do not access comm channel if it has not yet been initialized
  net/mlx4_en: Fix panic during reboot
  net/mlx4_en: Process all completions in RX rings after port goes up
  net/mlx4_en: Resolve dividing by zero in 32-bit system
  net/mlx4_core: Change the default value of enable_qos
  net/mlx4_core: Avoid setting ports to auto when only one port type is supported
  net/mlx4_core: Fix the resource-type enum in res tracker to conform to FW spec
  ...
parents a909d3e6 fceb9c3e
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ Optional port properties:
and

 - phy-handle: See ethernet.txt file in the same directory.
 - phy-mode: See ethernet.txt file in the same directory.

or

+4 −4
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ A: There are always two trees (git repositories) in play. Both are driven
   Linus, and net-next is where the new code goes for the future release.
   You can find the trees here:

	http://git.kernel.org/?p=linux/kernel/git/davem/net.git
	http://git.kernel.org/?p=linux/kernel/git/davem/net-next.git
        https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
        https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git

Q: How often do changes from these trees make it to the mainline Linus tree?

@@ -76,7 +76,7 @@ Q: So where are we now in this cycle?

A: Load the mainline (Linus) page here:

	http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git
	https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

   and note the top of the "tags" section.  If it is rc1, it is early
   in the dev cycle.  If it was tagged rc7 a week ago, then a release
@@ -123,7 +123,7 @@ A: Normally Greg Kroah-Hartman collects stable commits himself, but

   It contains the patches which Dave has selected, but not yet handed
   off to Greg.  If Greg already has the patch, then it will be here:
	http://git.kernel.org/cgit/linux/kernel/git/stable/stable-queue.git
	https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git

   A quick way to find whether the patch is in this stable-queue is
   to simply clone the repo, and then git grep the mainline commit ID, e.g.
+0 −18
Original line number Diff line number Diff line
@@ -33,24 +33,6 @@ nf_conntrack_events - BOOLEAN
	If this option is enabled, the connection tracking code will
	provide userspace with connection tracking events via ctnetlink.

nf_conntrack_events_retry_timeout - INTEGER (seconds)
	default 15

	This option is only relevant when "reliable connection tracking
	events" are used.  Normally, ctnetlink is "lossy", that is,
	events are normally dropped when userspace listeners can't keep up.

	Userspace can request "reliable event mode".  When this mode is
	active, the conntrack will only be destroyed after the event was
	delivered.  If event delivery fails, the kernel periodically
	re-tries to send the event to userspace.

	This is the maximum interval the kernel should use when re-trying
	to deliver the destroy event.

	A higher number means there will be fewer delivery retries and it
	will take longer for a backlog to be processed.

nf_conntrack_expect_max - INTEGER
	Maximum size of expectation table.  Default value is
	nf_conntrack_buckets / 256. Minimum is 1.
+22 −19
Original line number Diff line number Diff line
@@ -2552,15 +2552,18 @@ S: Supported
F:	drivers/net/ethernet/broadcom/genet/

BROADCOM BNX2 GIGABIT ETHERNET DRIVER
M:	Sony Chacko <sony.chacko@qlogic.com>
M:	Dept-HSGLinuxNICDev@qlogic.com
M:	Rasesh Mody <rasesh.mody@cavium.com>
M:	Harish Patil <harish.patil@cavium.com>
M:	Dept-GELinuxNICDev@cavium.com
L:	netdev@vger.kernel.org
S:	Supported
F:	drivers/net/ethernet/broadcom/bnx2.*
F:	drivers/net/ethernet/broadcom/bnx2_*

BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
M:	Ariel Elior <ariel.elior@qlogic.com>
M:	Yuval Mintz <Yuval.Mintz@cavium.com>
M:	Ariel Elior <ariel.elior@cavium.com>
M:	everest-linux-l2@cavium.com
L:	netdev@vger.kernel.org
S:	Supported
F:	drivers/net/ethernet/broadcom/bnx2x/
@@ -2767,7 +2770,9 @@ S: Supported
F:	drivers/scsi/bfa/

BROCADE BNA 10 GIGABIT ETHERNET DRIVER
M:	Rasesh Mody <rasesh.mody@qlogic.com>
M:	Rasesh Mody <rasesh.mody@cavium.com>
M:	Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
M:	Dept-GELinuxNICDev@cavium.com
L:	netdev@vger.kernel.org
S:	Supported
F:	drivers/net/ethernet/brocade/bna/
@@ -8517,11 +8522,10 @@ F: Documentation/devicetree/bindings/net/wireless/
F:	drivers/net/wireless/

NETXEN (1/10) GbE SUPPORT
M:	Manish Chopra <manish.chopra@qlogic.com>
M:	Sony Chacko <sony.chacko@qlogic.com>
M:	Rajesh Borundia <rajesh.borundia@qlogic.com>
M:	Manish Chopra <manish.chopra@cavium.com>
M:	Rahul Verma <rahul.verma@cavium.com>
M:	Dept-GELinuxNICDev@cavium.com
L:	netdev@vger.kernel.org
W:	http://www.qlogic.com
S:	Supported
F:	drivers/net/ethernet/qlogic/netxen/

@@ -9897,33 +9901,32 @@ F: Documentation/scsi/LICENSE.qla4xxx
F:	drivers/scsi/qla4xxx/

QLOGIC QLA3XXX NETWORK DRIVER
M:	Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
M:	Ron Mercer <ron.mercer@qlogic.com>
M:	linux-driver@qlogic.com
M:	Dept-GELinuxNICDev@cavium.com
L:	netdev@vger.kernel.org
S:	Supported
F:	Documentation/networking/LICENSE.qla3xxx
F:	drivers/net/ethernet/qlogic/qla3xxx.*

QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
M:	Dept-GELinuxNICDev@qlogic.com
M:	Harish Patil <harish.patil@cavium.com>
M:	Manish Chopra <manish.chopra@cavium.com>
M:	Dept-GELinuxNICDev@cavium.com
L:	netdev@vger.kernel.org
S:	Supported
F:	drivers/net/ethernet/qlogic/qlcnic/

QLOGIC QLGE 10Gb ETHERNET DRIVER
M:	Harish Patil <harish.patil@qlogic.com>
M:	Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
M:	Dept-GELinuxNICDev@qlogic.com
M:	linux-driver@qlogic.com
M:	Harish Patil <harish.patil@cavium.com>
M:	Manish Chopra <manish.chopra@cavium.com>
M:	Dept-GELinuxNICDev@cavium.com
L:	netdev@vger.kernel.org
S:	Supported
F:	drivers/net/ethernet/qlogic/qlge/

QLOGIC QL4xxx ETHERNET DRIVER
M:	Yuval Mintz <Yuval.Mintz@qlogic.com>
M:	Ariel Elior <Ariel.Elior@qlogic.com>
M:	everest-linux-l2@qlogic.com
M:	Yuval Mintz <Yuval.Mintz@cavium.com>
M:	Ariel Elior <Ariel.Elior@cavium.com>
M:	everest-linux-l2@cavium.com
L:	netdev@vger.kernel.org
S:	Supported
F:	drivers/net/ethernet/qlogic/qed/
+4 −8
Original line number Diff line number Diff line
@@ -53,10 +53,8 @@ static inline __sum16 csum_fold(__wsum sum)
	return (__force __sum16)(~((__force u32)sum + tmp) >> 16);
}

static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
                                     unsigned short len,
                                     unsigned short proto,
                                     __wsum sum)
static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
					__u8 proto, __wsum sum)
{
#ifdef __powerpc64__
	unsigned long s = (__force u32)sum;
@@ -83,10 +81,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
 * computes the checksum of the TCP/UDP pseudo-header
 * returns a 16-bit checksum, already complemented
 */
static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
					unsigned short len,
					unsigned short proto,
					__wsum sum)
static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len,
					__u8 proto, __wsum sum)
{
	return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
}
Loading