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

Commit 54704614 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) Use an appropriate TSQ pacing shift in mac80211, from Toke
    Høiland-Jørgensen.

 2) Just like ipv4's ip_route_me_harder(), we have to use skb_to_full_sk
    in ip6_route_me_harder, from Eric Dumazet.

 3) Fix several shutdown races and similar other problems in l2tp, from
    James Chapman.

 4) Handle missing XDP flush properly in tuntap, for real this time.
    From Jason Wang.

 5) Out-of-bounds access in powerpc ebpf tailcalls, from Daniel
    Borkmann.

 6) Fix phy_resume() locking, from Andrew Lunn.

 7) IFLA_MTU values are ignored on newlink for some tunnel types, fix
    from Xin Long.

 8) Revert F-RTO middle box workarounds, they only handle one dimension
    of the problem. From Yuchung Cheng.

 9) Fix socket refcounting in RDS, from Ka-Cheong Poon.

10) Don't allow ppp unit registration to an unregistered channel, from
    Guillaume Nault.

11) Various hv_netvsc fixes from Stephen Hemminger.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (98 commits)
  hv_netvsc: propagate rx filters to VF
  hv_netvsc: filter multicast/broadcast
  hv_netvsc: defer queue selection to VF
  hv_netvsc: use napi_schedule_irqoff
  hv_netvsc: fix race in napi poll when rescheduling
  hv_netvsc: cancel subchannel setup before halting device
  hv_netvsc: fix error unwind handling if vmbus_open fails
  hv_netvsc: only wake transmit queue if link is up
  hv_netvsc: avoid retry on send during shutdown
  virtio-net: re enable XDP_REDIRECT for mergeable buffer
  ppp: prevent unregistered channels from connecting to PPP units
  tc-testing: skbmod: fix match value of ethertype
  mlxsw: spectrum_switchdev: Check success of FDB add operation
  net: make skb_gso_*_seglen functions private
  net: xfrm: use skb_gso_validate_network_len() to check gso sizes
  net: sched: tbf: handle GSO_BY_FRAGS case in enqueue
  net: rename skb_gso_validate_mtu -> skb_gso_validate_network_len
  rds: Incorrect reference counting in TCP socket creation
  net: ethtool: don't ignore return from driver get_fecparam method
  vrf: check forwarding on the original netdevice when generating ICMP dest unreachable
  ...
parents 661e50bc a7f0fb1b

Documentation/devicetree/bindings/net/renesas,ravb.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required properties: 
      - "renesas,etheravb-r8a7795" for the R8A7795 SoC.

      - "renesas,etheravb-r8a7796" for the R8A7796 SoC.

      - "renesas,etheravb-r8a77970" for the R8A77970 SoC.

      - "renesas,etheravb-r8a77980" for the R8A77980 SoC.

      - "renesas,etheravb-r8a77995" for the R8A77995 SoC.

      - "renesas,etheravb-rcar-gen3" as a fallback for the above

		R-Car Gen3 devices.

arch/arm/mach-orion5x/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ config MACH_KUROBOX_PRO 


config MACH_DNS323

	bool "D-Link DNS-323"

	select GENERIC_NET_UTILS

	select I2C_BOARDINFO if I2C

	help

	  Say 'Y' here if you want your kernel to support the
@@ -66,7 +65,6 @@ config MACH_DNS323 


config MACH_TS209

	bool "QNAP TS-109/TS-209"

	select GENERIC_NET_UTILS

	help

	  Say 'Y' here if you want your kernel to support the

	  QNAP TS-109/TS-209 platform.
@@ -101,7 +99,6 @@ config MACH_LINKSTATION_LS_HGL 


config MACH_TS409

	bool "QNAP TS-409"

	select GENERIC_NET_UTILS

	help

	  Say 'Y' here if you want your kernel to support the

	  QNAP TS-409 platform.

arch/arm/mach-orion5x/dns323-setup.c

+50 −3
Original line number Diff line number Diff line
@@ -173,10 +173,42 @@ static struct mv643xx_eth_platform_data dns323_eth_data = { 
	.phy_addr = MV643XX_ETH_PHY_ADDR(8),

};



/* dns323_parse_hex_*() taken from tsx09-common.c; should a common copy of these

 * functions be kept somewhere?

 */

static int __init dns323_parse_hex_nibble(char n)

{

	if (n >= '0' && n <= '9')

		return n - '0';



	if (n >= 'A' && n <= 'F')

		return n - 'A' + 10;



	if (n >= 'a' && n <= 'f')

		return n - 'a' + 10;



	return -1;

}



static int __init dns323_parse_hex_byte(const char *b)

{

	int hi;

	int lo;



	hi = dns323_parse_hex_nibble(b[0]);

	lo = dns323_parse_hex_nibble(b[1]);



	if (hi < 0 || lo < 0)

		return -1;



	return (hi << 4) | lo;

}



static int __init dns323_read_mac_addr(void)

{

	u_int8_t addr[6];

	void __iomem *mac_page;

	int i;

	char *mac_page;



	/* MAC address is stored as a regular ol' string in /dev/mtdblock4

	 * (0x007d0000-0x00800000) starting at offset 196480 (0x2ff80).
@@ -185,8 +217,23 @@ static int __init dns323_read_mac_addr(void) 
	if (!mac_page)

		return -ENOMEM;



	if (!mac_pton((__force const char *) mac_page, addr))

	/* Sanity check the string we're looking at */

	for (i = 0; i < 5; i++) {

		if (*(mac_page + (i * 3) + 2) != ':') {

			goto error_fail;

		}

	}



	for (i = 0; i < 6; i++)	{

		int byte;



		byte = dns323_parse_hex_byte(mac_page + (i * 3));

		if (byte < 0) {

			goto error_fail;

		}



		addr[i] = byte;

	}



	iounmap(mac_page);

	printk("DNS-323: Found ethernet MAC address: %pM\n", addr);

arch/arm/mach-orion5x/tsx09-common.c

+45 −4
Original line number Diff line number Diff line
@@ -53,13 +53,54 @@ struct mv643xx_eth_platform_data qnap_tsx09_eth_data = { 
	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),

};



static int __init qnap_tsx09_parse_hex_nibble(char n)

{

	if (n >= '0' && n <= '9')

		return n - '0';



	if (n >= 'A' && n <= 'F')

		return n - 'A' + 10;



	if (n >= 'a' && n <= 'f')

		return n - 'a' + 10;



	return -1;

}



static int __init qnap_tsx09_parse_hex_byte(const char *b)

{

	int hi;

	int lo;



	hi = qnap_tsx09_parse_hex_nibble(b[0]);

	lo = qnap_tsx09_parse_hex_nibble(b[1]);



	if (hi < 0 || lo < 0)

		return -1;



	return (hi << 4) | lo;

}



static int __init qnap_tsx09_check_mac_addr(const char *addr_str)

{

	u_int8_t addr[6];

	int i;



	for (i = 0; i < 6; i++) {

		int byte;



	if (!mac_pton(addr_str, addr))

		/*

		 * Enforce "xx:xx:xx:xx:xx:xx\n" format.

		 */

		if (addr_str[(i * 3) + 2] != ((i < 5) ? ':' : '\n'))

			return -1;



		byte = qnap_tsx09_parse_hex_byte(addr_str + (i * 3));

		if (byte < 0)

			return -1;

		addr[i] = byte;

	}



	printk(KERN_INFO "tsx09: found ethernet mac address %pM\n", addr);



	memcpy(qnap_tsx09_eth_data.mac_addr, addr, 6);
@@ -77,12 +118,12 @@ void __init qnap_tsx09_find_mac_addr(u32 mem_base, u32 size) 
	unsigned long addr;



	for (addr = mem_base; addr < (mem_base + size); addr += 1024) {

		void __iomem *nor_page;

		char *nor_page;

		int ret = 0;



		nor_page = ioremap(addr, 1024);

		if (nor_page != NULL) {

			ret = qnap_tsx09_check_mac_addr((__force const char *)nor_page);

			ret = qnap_tsx09_check_mac_addr(nor_page);

			iounmap(nor_page);

		}

arch/powerpc/net/bpf_jit_comp64.c

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ static void bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32 
	 *   goto out;

	 */

	PPC_LWZ(b2p[TMP_REG_1], b2p_bpf_array, offsetof(struct bpf_array, map.max_entries));

	PPC_RLWINM(b2p_index, b2p_index, 0, 0, 31);

	PPC_CMPLW(b2p_index, b2p[TMP_REG_1]);

	PPC_BCC(COND_GE, out);