Commit ba804bb4 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) The per-network-namespace loopback device, and thus its namespace,
    can have its teardown deferred for a long time if a kernel created
    TCP socket closes and the namespace is exiting meanwhile. The kernel
    keeps trying to finish the close sequence until it times out (which
    takes quite some time).

    Fix this by forcing the socket closed in this situation, from Dan
    Streetman.

 2) Fix regression where we're trying to invoke the update_pmtu method
    on route types (in this case metadata tunnel routes) that don't
    implement the dst_ops method. Fix from Nicolas Dichtel.

 3) Fix long standing memory corruption issues in r8169 driver by
    performing the chip statistics DMA programming more correctly. From
    Francois Romieu.

 4) Handle local broadcast sends over VRF routes properly, from David
    Ahern.

 5) Don't refire the DCCP CCID2 timer endlessly, otherwise the socket
    can never be released. From Alexey Kodanev.

 6) Set poll flags properly in VSOCK protocol layer, from Stefan
    Hajnoczi.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  VSOCK: set POLLOUT | POLLWRNORM for TCP_CLOSING
  dccp: don't restart ccid2_hc_tx_rto_expire() if sk in closed state
  net: vrf: Add support for sends to local broadcast address
  r8169: fix memory corruption on retrieval of hardware statistics.
  net: don't call update_pmtu unconditionally
  net: tcp: close sock if net namespace is exiting
parents db218549 ba3169fc

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+1 −2
Original line number Diff line number Diff line
@@ -1456,8 +1456,7 @@ void ipoib_cm_skb_too_long(struct net_device *dev, struct sk_buff *skb, 
	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int e = skb_queue_empty(&priv->cm.skb_queue);



	if (skb_dst(skb))

		skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu);

	skb_dst_update_pmtu(skb, mtu);



	skb_queue_tail(&priv->cm.skb_queue, skb);

	if (e)

drivers/net/ethernet/realtek/r8169.c

+2 −7
Original line number Diff line number Diff line
@@ -2244,19 +2244,14 @@ static bool rtl8169_do_counters(struct net_device *dev, u32 counter_cmd) 
	void __iomem *ioaddr = tp->mmio_addr;

	dma_addr_t paddr = tp->counters_phys_addr;

	u32 cmd;

	bool ret;



	RTL_W32(CounterAddrHigh, (u64)paddr >> 32);

	RTL_R32(CounterAddrHigh);

	cmd = (u64)paddr & DMA_BIT_MASK(32);

	RTL_W32(CounterAddrLow, cmd);

	RTL_W32(CounterAddrLow, cmd | counter_cmd);



	ret = rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000);



	RTL_W32(CounterAddrLow, 0);

	RTL_W32(CounterAddrHigh, 0);



	return ret;

	return rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000);

}



static bool rtl8169_reset_counters(struct net_device *dev)

drivers/net/geneve.c

+2 −2
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
		int mtu = dst_mtu(&rt->dst) - sizeof(struct iphdr) -

			  GENEVE_BASE_HLEN - info->options_len - 14;



		skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu);

		skb_dst_update_pmtu(skb, mtu);

	}



	sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
@@ -875,7 +875,7 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
		int mtu = dst_mtu(dst) - sizeof(struct ipv6hdr) -

			  GENEVE_BASE_HLEN - info->options_len - 14;



		skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu);

		skb_dst_update_pmtu(skb, mtu);

	}



	sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);

drivers/net/vrf.c

+3 −2
Original line number Diff line number Diff line
@@ -673,8 +673,9 @@ static struct sk_buff *vrf_ip_out(struct net_device *vrf_dev, 
				  struct sock *sk,

				  struct sk_buff *skb)

{

	/* don't divert multicast */

	if (ipv4_is_multicast(ip_hdr(skb)->daddr))

	/* don't divert multicast or local broadcast */

	if (ipv4_is_multicast(ip_hdr(skb)->daddr) ||

	    ipv4_is_lbcast(ip_hdr(skb)->daddr))

		return skb;



	if (qdisc_tx_is_default(vrf_dev))

drivers/net/vxlan.c

+2 −4
Original line number Diff line number Diff line
@@ -2158,8 +2158,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
		if (skb_dst(skb)) {

			int mtu = dst_mtu(ndst) - VXLAN_HEADROOM;



			skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL,

						       skb, mtu);

			skb_dst_update_pmtu(skb, mtu);

		}



		tos = ip_tunnel_ecn_encap(tos, old_iph, skb);
@@ -2200,8 +2199,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
		if (skb_dst(skb)) {

			int mtu = dst_mtu(ndst) - VXLAN6_HEADROOM;



			skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL,

						       skb, mtu);

			skb_dst_update_pmtu(skb, mtu);

		}



		tos = ip_tunnel_ecn_encap(tos, old_iph, skb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE