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

Commit 64fce444 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) BPF speculation prevention and BPF_JIT_ALWAYS_ON, from Alexei
    Starovoitov.

 2) Revert dev_get_random_name() changes as adjust the error code
    returns seen by userspace definitely breaks stuff.

 3) Fix TX DMA map/unmap on older iwlwifi devices, from Emmanuel
    Grumbach.

 4) From wrong AF family when requesting sock diag modules, from Andrii
    Vladyka.

 5) Don't add new ipv6 routes attached to the null_entry, from Wei Wang.

 6) Some SCTP sockopt length fixes from Marcelo Ricardo Leitner.

 7) Don't leak when removing VLAN ID 0, from Cong Wang.

 8) Hey there's a potential leak in ipv6_make_skb() too, from Eric
    Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (27 commits)
  ipv6: sr: fix TLVs not being copied using setsockopt
  ipv6: fix possible mem leaks in ipv6_make_skb()
  mlxsw: spectrum_qdisc: Don't use variable array in mlxsw_sp_tclass_congestion_enable
  mlxsw: pci: Wait after reset before accessing HW
  nfp: always unmask aux interrupts at init
  8021q: fix a memory leak for VLAN 0 device
  of_mdio: avoid MDIO bus removal when a PHY is missing
  caif_usb: use strlcpy() instead of strncpy()
  doc: clarification about setting SO_ZEROCOPY
  net: gianfar_ptp: move set_fipers() to spinlock protecting area
  sctp: make use of pre-calculated len
  sctp: add a ceiling to optlen in some sockopts
  sctp: GFP_ATOMIC is not needed in sctp_setsockopt_events
  bpf: introduce BPF_JIT_ALWAYS_ON config
  bpf: avoid false sharing of map refcount with max_entries
  ipv6: remove null_entry before adding default route
  SolutionEngine771x: add Ether TSU resource
  SolutionEngine771x: fix Ether platform data
  docs-rst: networking: wire up msg_zerocopy
  net: ipv4: emulate READ_ONCE() on ->hdrincl bit-field in raw_sendmsg()
  ...
parents 5f615b97 ccc12b11

Documentation/networking/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Contents: 
   batman-adv

   kapi

   z8530book

   msg_zerocopy



.. only::  subproject
@@ -16,4 +17,3 @@ Contents: 
   =======



   * :ref:`genindex`

Documentation/networking/msg_zerocopy.rst

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ this flag, a process must first signal intent by setting a socket option: 
	if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &one, sizeof(one)))

		error(1, errno, "setsockopt zerocopy");



Setting the socket option only works when the socket is in its initial

(TCP_CLOSED) state.  Trying to set the option for a socket returned by accept(),

for example, will lead to an EBUSY error. In this case, the option should be set

to the listening socket and it will be inherited by the accepted sockets.



Transmission

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

arch/sh/boards/mach-se/770x/setup.c

+20 −4
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/sh_eth.h>

#include <mach-se/mach/se.h>

#include <mach-se/mach/mrshpc.h>

#include <asm/machvec.h>
@@ -115,13 +116,23 @@ static struct platform_device heartbeat_device = { 
#if defined(CONFIG_CPU_SUBTYPE_SH7710) ||\

	defined(CONFIG_CPU_SUBTYPE_SH7712)

/* SH771X Ethernet driver */

static struct sh_eth_plat_data sh_eth_plat = {

	.phy = PHY_ID,

	.phy_interface = PHY_INTERFACE_MODE_MII,

};



static struct resource sh_eth0_resources[] = {

	[0] = {

		.start = SH_ETH0_BASE,

		.end = SH_ETH0_BASE + 0x1B8,

		.end = SH_ETH0_BASE + 0x1B8 - 1,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = SH_TSU_BASE,

		.end = SH_TSU_BASE + 0x200 - 1,

		.flags = IORESOURCE_MEM,

	},

	[2] = {

		.start = SH_ETH0_IRQ,

		.end = SH_ETH0_IRQ,

		.flags = IORESOURCE_IRQ,
@@ -132,7 +143,7 @@ static struct platform_device sh_eth0_device = { 
	.name = "sh771x-ether",

	.id = 0,

	.dev = {

		.platform_data = PHY_ID,

		.platform_data = &sh_eth_plat,

	},

	.num_resources = ARRAY_SIZE(sh_eth0_resources),

	.resource = sh_eth0_resources,
@@ -141,10 +152,15 @@ static struct platform_device sh_eth0_device = { 
static struct resource sh_eth1_resources[] = {

	[0] = {

		.start = SH_ETH1_BASE,

		.end = SH_ETH1_BASE + 0x1B8,

		.end = SH_ETH1_BASE + 0x1B8 - 1,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = SH_TSU_BASE,

		.end = SH_TSU_BASE + 0x200 - 1,

		.flags = IORESOURCE_MEM,

	},

	[2] = {

		.start = SH_ETH1_IRQ,

		.end = SH_ETH1_IRQ,

		.flags = IORESOURCE_IRQ,
@@ -155,7 +171,7 @@ static struct platform_device sh_eth1_device = { 
	.name = "sh771x-ether",

	.id = 1,

	.dev = {

		.platform_data = PHY_ID,

		.platform_data = &sh_eth_plat,

	},

	.num_resources = ARRAY_SIZE(sh_eth1_resources),

	.resource = sh_eth1_resources,

arch/sh/include/mach-se/mach/se.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
/* Base address */

#define SH_ETH0_BASE 0xA7000000

#define SH_ETH1_BASE 0xA7000400

#define SH_TSU_BASE  0xA7000800

/* PHY ID */

#if defined(CONFIG_CPU_SUBTYPE_SH7710)

# define PHY_ID 0x00

drivers/net/ethernet/freescale/gianfar_ptp.c

+1 −2
Original line number Diff line number Diff line
@@ -319,11 +319,10 @@ static int ptp_gianfar_adjtime(struct ptp_clock_info *ptp, s64 delta) 
	now = tmr_cnt_read(etsects);

	now += delta;

	tmr_cnt_write(etsects, now);

	set_fipers(etsects);



	spin_unlock_irqrestore(&etsects->lock, flags);



	set_fipers(etsects);



	return 0;

}