Commit 087afe8a 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 and more updates from David Miller:

 1) Tunneling fixes from Tom Herbert and Alexander Duyck.

 2) AF_UNIX updates some struct sock bit fields with the socket lock,
    whereas setsockopt() sets overlapping ones with locking.  Seperate
    out the synchronized vs.  the AF_UNIX unsynchronized ones to avoid
    corruption.  From Andrey Ryabinin.

 3) Mount BPF filesystem with mount_nodev rather than mount_ns, from
    Eric Biederman.

 4) A couple kmemdup conversions, from Muhammad Falak R Wani.

 5) BPF verifier fixes from Alexei Starovoitov.

 6) Don't let tunneled UDP packets get stuck in socket queues, if
    something goes wrong during the encapsulation just drop the packet
    rather than signalling an error up the call stack.  From Hannes
    Frederic Sowa.

 7) SKB ref after free in batman-adv, from Florian Westphal.

 8) TCP iSCSI, ocfs2, rds, and tipc have to disable BH in it's TCP
    callbacks since the TCP stack runs pre-emptibly now.  From Eric
    Dumazet.

 9) Fix crash in fixed_phy_add, from Rabin Vincent.

10) Fix length checks in xen-netback, from Paul Durrant.

11) Fix mixup in KEY vs KEYID macsec attributes, from Sabrina Dubroca.

12) RDS connection spamming bug fixes from Sowmini Varadhan

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (152 commits)
  net: suppress warnings on dev_alloc_skb
  uapi glibc compat: fix compilation when !__USE_MISC in glibc
  udp: prevent skbs lingering in tunnel socket queues
  bpf: teach verifier to recognize imm += ptr pattern
  bpf: support decreasing order in direct packet access
  net: usb: ch9200: use kmemdup
  ps3_gelic: use kmemdup
  net:liquidio: use kmemdup
  bpf: Use mount_nodev not mount_ns to mount the bpf filesystem
  net: cdc_ncm: update datagram size after changing mtu
  tuntap: correctly wake up process during uninit
  intel: Add support for IPv6 IP-in-IP offload
  ip6_gre: Do not allow segmentation offloads GRE_CSUM is enabled with FOU/GUE
  RDS: TCP: Avoid rds connection churn from rogue SYNs
  RDS: TCP: rds_tcp_accept_worker() must exit gracefully when terminating rds-tcp
  net: sock: move ->sk_shutdown out of bitfields.
  ipv6: Don't reset inner headers in ip6_tnl_xmit
  ip4ip6: Support for GSO/GRO
  ip6ip6: Support for GSO/GRO
  ipv6: Set features for IPv6 tunnels
  ...
parents 54cf809b 95829b3a

Documentation/devicetree/bindings/net/phy.txt

+0 −3
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ Optional Properties: 
- broken-turn-around: If set, indicates the PHY device does not correctly

  release the turn around line low at the end of a MDIO transaction.



- reset-gpios: Reference to a GPIO used to reset the phy.



Example:



ethernet-phy@0 {
@@ -44,5 +42,4 @@ ethernet-phy@0 { 
	interrupt-parent = <40000>;

	interrupts = <35 1>;

	reg = <0>;

	reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;

};

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5902,6 +5902,7 @@ F: drivers/net/wireless/intel/iwlegacy/ 
INTEL WIRELESS WIFI LINK (iwlwifi)

M:	Johannes Berg <johannes.berg@intel.com>

M:	Emmanuel Grumbach <emmanuel.grumbach@intel.com>

M:	Luca Coelho <luciano.coelho@intel.com>

M:	Intel Linux Wireless <linuxwifi@intel.com>

L:	linux-wireless@vger.kernel.org

W:	http://intellinuxwireless.org

drivers/net/Space.c

+10 −11
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <net/Space.h>



/* A unified ethernet device probe.  This is the easiest way to have every

   ethernet adaptor have the name "eth[0123...]".

 * ethernet adaptor have the name "eth[0123...]".

 */



struct devprobe2 {
@@ -46,6 +46,7 @@ struct devprobe2 { 
static int __init probe_list2(int unit, struct devprobe2 *p, int autoprobe)

{

	struct net_device *dev;



	for (; p->probe; p++) {

		if (autoprobe && p->status)

			continue;
@@ -58,8 +59,7 @@ static int __init probe_list2(int unit, struct devprobe2 *p, int autoprobe) 
	return -ENODEV;

}



/*

 * ISA probes that touch addresses < 0x400 (including those that also

/* ISA probes that touch addresses < 0x400 (including those that also

 * look for EISA/PCI cards in addition to ISA cards).

 */

static struct devprobe2 isa_probes[] __initdata = {
@@ -89,8 +89,8 @@ static struct devprobe2 isa_probes[] __initdata = { 
	{cs89x0_probe, 0},

#endif

#endif

#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET)	/* Intel I82596 */

	{i82596_probe, 0},

#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET)	/* Intel */

	{i82596_probe, 0},					/* I82596 */

#endif

#ifdef CONFIG_NI65

	{ni65_probe, 0},
@@ -123,8 +123,7 @@ static struct devprobe2 m68k_probes[] __initdata = { 
	{NULL, 0},

};



/*

 * Unified ethernet device probe, segmented per architecture and

/* Unified ethernet device probe, segmented per architecture and

 * per bus interface. This drives the legacy devices only for now.

 */

drivers/net/ethernet/amd/au1000_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -1269,7 +1269,7 @@ static int au1000_probe(struct platform_device *pdev) 
		aup->phy_irq = pd->phy_irq;

	}



	if (aup->phy_busid && aup->phy_busid > 0) {

	if (aup->phy_busid > 0) {

		dev_err(&pdev->dev, "MAC0-associated PHY attached 2nd MACs MII bus not supported yet\n");

		err = -ENODEV;

		goto err_mdiobus_alloc;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+2 −3
Original line number Diff line number Diff line
@@ -13259,12 +13259,11 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, 
		NETIF_F_RXHASH | NETIF_F_HW_VLAN_CTAG_TX;

	if (!chip_is_e1x) {

		dev->hw_features |= NETIF_F_GSO_GRE | NETIF_F_GSO_UDP_TUNNEL |

				    NETIF_F_GSO_IPIP | NETIF_F_GSO_SIT;

				    NETIF_F_GSO_IPXIP4;

		dev->hw_enc_features =

			NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_SG |

			NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 |

			NETIF_F_GSO_IPIP |

			NETIF_F_GSO_SIT |

			NETIF_F_GSO_IPXIP4 |

			NETIF_F_GSO_GRE | NETIF_F_GSO_UDP_TUNNEL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE