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

Commit 0e911788 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:
 "Just a couple more stragglers, I really hope this is it.

  1) Don't let frags slip down into the GRO segmentation handlers, from
     Steffen Klassert.

  2) Truesize under-estimation triggers warnings in TCP over loopback
     with socket filters, 2 part fix from Eric Dumazet.

  3) Fix undesirable reset of bonding MTU to ETH_HLEN on slave removal,
     from Paolo Abeni.

  4) If we flush the XFRM policy after garbage collection, it doesn't
     work because stray entries can be created afterwards. Fix from Xin
     Long.

  5) Hung socket connection fixes in TIPC from Parthasarathy Bhuvaragan.

  6) Fix GRO regression with IPSEC when netfilter is disabled, from
     Sabrina Dubroca.

  7) Fix cpsw driver Kconfig dependency regression, from Arnd Bergmann"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: hso: register netdev later to avoid a race condition
  net: adjust skb->truesize in ___pskb_trim()
  tcp: do not underestimate skb->truesize in tcp_trim_head()
  bonding: avoid defaulting hard_header_len to ETH_HLEN on slave removal
  ipv4: Don't pass IP fragments to upper layer GRO handlers.
  cpsw/netcp: refine cpts dependency
  tipc: close the connection if protocol messages contain errors
  tipc: improve error validations for sockets in CONNECTING state
  tipc: Fix missing connection request handling
  xfrm: fix GRO for !CONFIG_NETFILTER
  xfrm: do the garbage collection after flushing policy
parents affb852d 4c761daf

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1104,11 +1104,11 @@ static void bond_compute_features(struct bonding *bond) 
		gso_max_size = min(gso_max_size, slave->dev->gso_max_size);

		gso_max_segs = min(gso_max_segs, slave->dev->gso_max_segs);

	}

	bond_dev->hard_header_len = max_hard_header_len;



done:

	bond_dev->vlan_features = vlan_features;

	bond_dev->hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL;

	bond_dev->hard_header_len = max_hard_header_len;

	bond_dev->gso_max_segs = gso_max_segs;

	netif_set_gso_max_size(bond_dev, gso_max_size);

drivers/net/ethernet/ti/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ config TI_CPSW 
config TI_CPTS

	bool "TI Common Platform Time Sync (CPTS) Support"

	depends on TI_CPSW || TI_KEYSTONE_NETCP

	depends on PTP_1588_CLOCK

	depends on POSIX_TIMERS

	---help---

	  This driver supports the Common Platform Time Sync unit of

	  the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem.
@@ -87,6 +87,8 @@ config TI_CPTS_MOD 
	tristate

	depends on TI_CPTS

	default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y

	select NET_PTP_CLASSIFY

	imply PTP_1588_CLOCK

	default m



config TI_KEYSTONE_NETCP

drivers/net/usb/hso.c

+7 −7
Original line number Diff line number Diff line
@@ -2534,13 +2534,6 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface, 
	SET_NETDEV_DEV(net, &interface->dev);

	SET_NETDEV_DEVTYPE(net, &hso_type);



	/* registering our net device */

	result = register_netdev(net);

	if (result) {

		dev_err(&interface->dev, "Failed to register device\n");

		goto exit;

	}



	/* start allocating */

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

		hso_net->mux_bulk_rx_urb_pool[i] = usb_alloc_urb(0, GFP_KERNEL);
@@ -2560,6 +2553,13 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface, 


	add_net_device(hso_dev);



	/* registering our net device */

	result = register_netdev(net);

	if (result) {

		dev_err(&interface->dev, "Failed to register device\n");

		goto exit;

	}



	hso_log_port(hso_dev);



	hso_create_rfkill(hso_dev, interface);

net/core/skbuff.c

+2 −0
Original line number Diff line number Diff line
@@ -1576,6 +1576,8 @@ int ___pskb_trim(struct sk_buff *skb, unsigned int len) 
		skb_set_tail_pointer(skb, len);

	}



	if (!skb->sk || skb->destructor == sock_edemux)

		skb_condense(skb);

	return 0;

}

EXPORT_SYMBOL(___pskb_trim);

net/ipv4/af_inet.c

+3 −0
Original line number Diff line number Diff line
@@ -1343,6 +1343,9 @@ struct sk_buff **inet_gro_receive(struct sk_buff **head, struct sk_buff *skb) 
	if (*(u8 *)iph != 0x45)

		goto out_unlock;



	if (ip_is_fragment(iph))

		goto out_unlock;



	if (unlikely(ip_fast_csum((u8 *)iph, 5)))

		goto out_unlock;