Commit a72db42c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) Unbalanced refcounting in TIPC, from Jon Maloy.

 2) Only allow TCP_MD5SIG to be set on sockets in close or listen state.
    Once the connection is established it makes no sense to change this.
    From Eric Dumazet.

 3) Missing attribute validation in neigh_dump_table(), also from Eric
    Dumazet.

 4) Fix address comparisons in SCTP, from Xin Long.

 5) Neigh proxy table clearing can deadlock, from Wolfgang Bumiller.

 6) Fix tunnel refcounting in l2tp, from Guillaume Nault.

 7) Fix double list insert in team driver, from Paolo Abeni.

 8) af_vsock.ko module was accidently made unremovable, from Stefan
    Hajnoczi.

 9) Fix reference to freed llc_sap object in llc stack, from Cong Wang.

10) Don't assume netdevice struct is DMA'able memory in virtio_net
    driver, from Michael S. Tsirkin.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (62 commits)
  net/smc: fix shutdown in state SMC_LISTEN
  bnxt_en: Fix memory fault in bnxt_ethtool_init()
  virtio_net: sparse annotation fix
  virtio_net: fix adding vids on big-endian
  virtio_net: split out ctrl buffer
  net: hns: Avoid action name truncation
  docs: ip-sysctl.txt: fix name of some ipv6 variables
  vmxnet3: fix incorrect dereference when rxvlan is disabled
  llc: hold llc_sap before release_sock()
  MAINTAINERS: Direct networking documentation changes to netdev
  atm: iphase: fix spelling mistake: "Tansmit" -> "Transmit"
  net: qmi_wwan: add Wistron Neweb D19Q1
  net: caif: fix spelling mistake "UKNOWN" -> "UNKNOWN"
  net: stmmac: Disable ACS Feature for GMAC >= 4
  net: mvpp2: Fix DMA address mask size
  net: change the comment of dev_mc_init
  net: qualcomm: rmnet: Fix warning seen with fill_info
  tun: fix vlan packet truncation
  tipc: fix infinite loop when dumping link monitor summary
  tipc: fix use-after-free in tipc_nametbl_stop
  ...
parents b9abdcfd 1255fcb2

Documentation/core-api/kernel-api.rst

+13 −0
Original line number Diff line number Diff line
@@ -136,6 +136,19 @@ Sorting 
.. kernel-doc:: lib/list_sort.c

   :export:



Text Searching

--------------



.. kernel-doc:: lib/textsearch.c

   :doc: ts_intro



.. kernel-doc:: lib/textsearch.c

   :export:



.. kernel-doc:: include/linux/textsearch.h

   :functions: textsearch_find textsearch_next \

               textsearch_get_pattern textsearch_get_pattern_len



UUID/GUID

---------

Documentation/networking/filter.txt

+3 −3
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ access to BPF code as well. 
BPF engine and instruction set

------------------------------



Under tools/net/ there's a small helper tool called bpf_asm which can

Under tools/bpf/ there's a small helper tool called bpf_asm which can

be used to write low-level filters for example scenarios mentioned in the

previous section. Asm-like syntax mentioned here has been implemented in

bpf_asm and will be used for further explanations (instead of dealing with
@@ -359,7 +359,7 @@ $ ./bpf_asm -c foo 
In particular, as usage with xt_bpf or cls_bpf can result in more complex BPF

filters that might not be obvious at first, it's good to test filters before

attaching to a live system. For that purpose, there's a small tool called

bpf_dbg under tools/net/ in the kernel source directory. This debugger allows

bpf_dbg under tools/bpf/ in the kernel source directory. This debugger allows

for testing BPF filters against given pcap files, single stepping through the

BPF code on the pcap's packets and to do BPF machine register dumps.
@@ -483,7 +483,7 @@ Example output from dmesg: 
[ 3389.935851] JIT code: 00000030: 00 e8 28 94 ff e0 83 f8 01 75 07 b8 ff ff 00 00

[ 3389.935852] JIT code: 00000040: eb 02 31 c0 c9 c3



In the kernel source tree under tools/net/, there's bpf_jit_disasm for

In the kernel source tree under tools/bpf/, there's bpf_jit_disasm for

generating disassembly out of the kernel log's hexdump:



# ./bpf_jit_disasm

Documentation/networking/ip-sysctl.txt

+4 −4
Original line number Diff line number Diff line
@@ -1390,26 +1390,26 @@ mld_qrv - INTEGER 
	Default: 2 (as specified by RFC3810 9.1)

	Minimum: 1 (as specified by RFC6636 4.5)



max_dst_opts_cnt - INTEGER

max_dst_opts_number - INTEGER

	Maximum number of non-padding TLVs allowed in a Destination

	options extension header. If this value is less than zero

	then unknown options are disallowed and the number of known

	TLVs allowed is the absolute value of this number.

	Default: 8



max_hbh_opts_cnt - INTEGER

max_hbh_opts_number - INTEGER

	Maximum number of non-padding TLVs allowed in a Hop-by-Hop

	options extension header. If this value is less than zero

	then unknown options are disallowed and the number of known

	TLVs allowed is the absolute value of this number.

	Default: 8



max dst_opts_len - INTEGER

max_dst_opts_length - INTEGER

	Maximum length allowed for a Destination options extension

	header.

	Default: INT_MAX (unlimited)



max hbh_opts_len - INTEGER

max_hbh_length - INTEGER

	Maximum length allowed for a Hop-by-Hop options extension

	header.

	Default: INT_MAX (unlimited)

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9773,6 +9773,7 @@ F: include/uapi/linux/net_namespace.h 
F:	tools/testing/selftests/net/

F:	lib/net_utils.c

F:	lib/random32.c

F:	Documentation/networking/



NETWORKING [IPSEC]

M:	Steffen Klassert <steffen.klassert@secunet.com>

drivers/atm/iphase.c

+2 −2
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static void ia_tx_poll (IADEV *iadev) { 
          if ((vcc->pop) && (skb1->len != 0))

          {

             vcc->pop(vcc, skb1);

             IF_EVENT(printk("Tansmit Done - skb 0x%lx return\n",

             IF_EVENT(printk("Transmit Done - skb 0x%lx return\n",

                                                          (long)skb1);)

          }

          else
@@ -1665,7 +1665,7 @@ static void tx_intr(struct atm_dev *dev) 
	status = readl(iadev->seg_reg+SEG_INTR_STATUS_REG);  

        if (status & TRANSMIT_DONE){



           IF_EVENT(printk("Tansmit Done Intr logic run\n");)

           IF_EVENT(printk("Transmit Done Intr logic run\n");)

           spin_lock_irqsave(&iadev->tx_lock, flags);

           ia_tx_poll(iadev);

           spin_unlock_irqrestore(&iadev->tx_lock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE