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

Commit 236fa078 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) Various TCP control block fixes, including one that crashes with
    SELinux, from David Ahern and Eric Dumazet.

 2) Fix ACK generation in rxrpc, from David Howells.

 3) ipvlan doesn't set the mark properly in the ipv4 route lookup key,
    from Gao Feng.

 4) SIT configuration doesn't take on the frag_off ipv4 field
    configuration properly, fix from Hangbin Liu.

 5) TSO can fail after device down/up on stmmac, fix from Lars Persson.

 6) Various bpftool fixes (mostly in JSON handling) from Quentin Monnet.

 7) Various SKB leak fixes in vhost/tun/tap (mostly observed as
    performance problems). From Wei Xu.

 8) mvpps's TX descriptors were not zero initialized, from Yan Markman.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (57 commits)
  tcp: use IPCB instead of TCP_SKB_CB in inet_exact_dif_match()
  tcp: add tcp_v4_fill_cb()/tcp_v4_restore_cb()
  rxrpc: Fix the MAINTAINERS record
  rxrpc: Use correct netns source in rxrpc_release_sock()
  liquidio: fix incorrect indentation of assignment statement
  stmmac: reset last TSO segment size after device open
  ipvlan: Add the skb->mark as flow4's member to lookup route
  s390/qeth: build max size GSO skbs on L2 devices
  s390/qeth: fix GSO throughput regression
  s390/qeth: fix thinko in IPv4 multicast address tracking
  tap: free skb if flags error
  tun: free skb in early errors
  vhost: fix skb leak in handle_rx()
  bnxt_en: Fix a variable scoping in bnxt_hwrm_do_send_msg()
  bnxt_en: fix dst/src fid for vxlan encap/decap actions
  bnxt_en: wildcard smac while creating tunnel decap filter
  bnxt_en: Need to unconditionally shut down RoCE in bnxt_shutdown
  phylink: ensure we take the link down when phylink_stop() is called
  sfp: warn about modules requiring address change sequence
  sfp: improve RX_LOS handling
  ...
parents 8ee5ad1d c2eb6d07

MAINTAINERS

+15 −3
Original line number Diff line number Diff line
@@ -554,13 +554,13 @@ S: Orphan 
F:	Documentation/filesystems/affs.txt

F:	fs/affs/



AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN

AFS FILESYSTEM

M:	David Howells <dhowells@redhat.com>

L:	linux-afs@lists.infradead.org

S:	Supported

F:	fs/afs/

F:	include/net/af_rxrpc.h

F:	net/rxrpc/af_rxrpc.c

F:	include/trace/events/afs.h

F:	Documentation/filesystems/afs.txt

W:	https://www.infradead.org/~dhowells/kafs/



AGPGART DRIVER
@@ -11776,6 +11776,18 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-deve 
S:	Maintained

F:	drivers/net/wireless/realtek/rtl8xxxu/



RXRPC SOCKETS (AF_RXRPC)

M:	David Howells <dhowells@redhat.com>

L:	linux-afs@lists.infradead.org

S:	Supported

F:	net/rxrpc/

F:	include/keys/rxrpc-type.h

F:	include/net/af_rxrpc.h

F:	include/trace/events/rxrpc.h

F:	include/uapi/linux/rxrpc.h

F:	Documentation/networking/rxrpc.txt

W:	https://www.infradead.org/~dhowells/kafs/



S3 SAVAGE FRAMEBUFFER DRIVER

M:	Antonino Daplas <adaplas@gmail.com>

L:	linux-fbdev@vger.kernel.org

drivers/net/can/flexcan.c

+5 −4
Original line number Diff line number Diff line
@@ -184,12 +184,12 @@ 
 * Below is some version info we got:

 *    SOC   Version   IP-Version  Glitch- [TR]WRN_INT IRQ Err Memory err RTR re-

 *                                Filter? connected?  Passive detection  ception in MB

 *   MX25  FlexCAN2  03.00.00.00     no        no         ?       no        no

 *   MX25  FlexCAN2  03.00.00.00     no        no        no       no        no

 *   MX28  FlexCAN2  03.00.04.00    yes       yes        no       no        no

 *   MX35  FlexCAN2  03.00.00.00     no        no         ?       no        no

 *   MX35  FlexCAN2  03.00.00.00     no        no        no       no        no

 *   MX53  FlexCAN2  03.00.00.00    yes        no        no       no        no

 *   MX6s  FlexCAN3  10.00.12.00    yes       yes        no       no       yes

 *   VF610 FlexCAN3  ?               no       yes         ?      yes       yes?

 *   VF610 FlexCAN3  ?               no       yes        no      yes       yes?

 *

 * Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected.

 */
@@ -297,7 +297,8 @@ static const struct flexcan_devtype_data fsl_imx6q_devtype_data = { 


static const struct flexcan_devtype_data fsl_vf610_devtype_data = {

	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |

		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,

		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP |

		FLEXCAN_QUIRK_BROKEN_PERR_STATE,

};



static const struct can_bittiming_const flexcan_bittiming_const = {

drivers/net/can/peak_canfd/peak_pciefd_main.c

+4 −1
Original line number Diff line number Diff line
@@ -825,7 +825,10 @@ static int peak_pciefd_probe(struct pci_dev *pdev, 
err_disable_pci:

	pci_disable_device(pdev);



	return err;

	/* pci_xxx_config_word() return positive PCIBIOS_xxx error codes while

	 * the probe() function must return a negative errno in case of failure

	 * (err is unchanged if negative) */

	return pcibios_err_to_errno(err);

}



/* free the board structure object, as well as its resources: */

drivers/net/can/sja1000/peak_pci.c

+4 −1
Original line number Diff line number Diff line
@@ -717,7 +717,10 @@ static int peak_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
failure_disable_pci:

	pci_disable_device(pdev);



	return err;

	/* pci_xxx_config_word() return positive PCIBIOS_xxx error codes while

	 * the probe() function must return a negative errno in case of failure

	 * (err is unchanged if negative) */

	return pcibios_err_to_errno(err);

}



static void peak_pci_remove(struct pci_dev *pdev)

drivers/net/can/ti_hecc.c

+3 −0
Original line number Diff line number Diff line
@@ -637,6 +637,9 @@ static int ti_hecc_rx_poll(struct napi_struct *napi, int quota) 
		mbx_mask = hecc_read(priv, HECC_CANMIM);

		mbx_mask |= HECC_TX_MBOX_MASK;

		hecc_write(priv, HECC_CANMIM, mbx_mask);

	} else {

		/* repoll is done only if whole budget is used */

		num_pkts = quota;

	}



	return num_pkts;