Commit 26273939 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) Fix handling of initial STATE message in TIPC, from Jon Paul Maloy.

 2) Fix stats handling in bcm_sysport_get_stats(), from Florian
    Fainelli.

 3) Reject 16777215 VNI value in geneve_validate(), from Girish
    Moodalbail.

 4) Fix initial IGMP sysctl setting regression, from Nikolay Borisov.

 5) Once a UFO fragmented frame is treated as UFO, we should continue
    doing so. Likewise once a frame has been segmented, we should
    continue doing that and not try to convert it to a UFO frame. From
    Willem de Bruijn.

 6) Test the AF_PACKET RX/TX ring pg_vec state under the socket lock to
    prevent races. From Willem de Bruijn.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  packet: fix tp_reserve race in packet_set_ring
  udp: consistently apply ufo or fragmentation
  net: sched: set xt_tgchk_param par.nft_compat as 0 in ipt_init_target
  igmp: Fix regression caused by igmp sysctl namespace code.
  geneve: maximum value of VNI cannot be used
  net: systemport: Fix software statistics for SYSTEMPORT Lite
  tipc: remove premature ESTABLISH FSM event at link synchronization
parents f213ad38 c27927e3

drivers/net/ethernet/broadcom/bcmsysport.c

+4 −0
Original line number Diff line number Diff line
@@ -449,6 +449,10 @@ static void bcm_sysport_get_stats(struct net_device *dev, 
			p = (char *)&dev->stats;

		else

			p = (char *)priv;



		if (priv->is_lite && !bcm_sysport_lite_stat_valid(s->type))

			continue;



		p += s->stat_offset;

		data[j] = *(unsigned long *)p;

		j++;

drivers/net/geneve.c

+1 −1
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ static int geneve_validate(struct nlattr *tb[], struct nlattr *data[], 
	if (data[IFLA_GENEVE_ID]) {

		__u32 vni =  nla_get_u32(data[IFLA_GENEVE_ID]);



		if (vni >= GENEVE_VID_MASK)

		if (vni >= GENEVE_N_VID)

			return -ERANGE;

	}

net/ipv4/af_inet.c

+7 −0
Original line number Diff line number Diff line
@@ -1731,6 +1731,13 @@ static __net_init int inet_init_net(struct net *net) 
	net->ipv4.sysctl_ip_prot_sock = PROT_SOCK;

#endif



	/* Some igmp sysctl, whose values are always used */

	net->ipv4.sysctl_igmp_max_memberships = 20;

	net->ipv4.sysctl_igmp_max_msf = 10;

	/* IGMP reports for link-local multicast groups are enabled by default */

	net->ipv4.sysctl_igmp_llm_reports = 1;

	net->ipv4.sysctl_igmp_qrv = 2;



	return 0;

}

net/ipv4/igmp.c

+0 −6
Original line number Diff line number Diff line
@@ -2974,12 +2974,6 @@ static int __net_init igmp_net_init(struct net *net) 
		goto out_sock;

	}



	/* Sysctl initialization */

	net->ipv4.sysctl_igmp_max_memberships = 20;

	net->ipv4.sysctl_igmp_max_msf = 10;

	/* IGMP reports for link-local multicast groups are enabled by default */

	net->ipv4.sysctl_igmp_llm_reports = 1;

	net->ipv4.sysctl_igmp_qrv = 2;

	return 0;



out_sock:

net/ipv4/ip_output.c

+5 −3
Original line number Diff line number Diff line
@@ -965,11 +965,12 @@ static int __ip_append_data(struct sock *sk, 
		csummode = CHECKSUM_PARTIAL;



	cork->length += length;

	if ((((length + (skb ? skb->len : fragheaderlen)) > mtu) ||

	     (skb && skb_is_gso(skb))) &&

	if ((skb && skb_is_gso(skb)) ||

	    (((length + (skb ? skb->len : fragheaderlen)) > mtu) &&

	    (skb_queue_len(queue) <= 1) &&

	    (sk->sk_protocol == IPPROTO_UDP) &&

	    (rt->dst.dev->features & NETIF_F_UFO) && !dst_xfrm(&rt->dst) &&

	    (sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx) {

	    (sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx)) {

		err = ip_ufo_append_data(sk, queue, getfrag, from, length,

					 hh_len, fragheaderlen, transhdrlen,

					 maxfraglen, flags);
@@ -1288,6 +1289,7 @@ ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page, 
		return -EINVAL;



	if ((size + skb->len > mtu) &&

	    (skb_queue_len(&sk->sk_write_queue) == 1) &&

	    (sk->sk_protocol == IPPROTO_UDP) &&

	    (rt->dst.dev->features & NETIF_F_UFO)) {

		if (skb->ip_summed != CHECKSUM_PARTIAL)

CRA Git | Maintained and supported by SUSTech CRA and CCSE