From: David S. Miller <davem@davemloft.net>
Date: Thu, 10 Aug 2017 19:11:16 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3b2b69efeca734b78bc85fd02253b0465bb2bec7;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge git://git./linux/kernel/git/davem/net

Mainline had UFO fixes, but UFO is removed in net-next so we
take the HEAD hunks.

Minor context conflict in bcmsysport statistics bug fix.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

3b2b69efeca734b78bc85fd02253b0465bb2bec7
diff --cc drivers/net/ethernet/broadcom/bcmsysport.c
index bf9ca3c79d1a,dc3052751bc1..b3a21418f511
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@@ -457,15 -450,11 +457,17 @@@ static void bcm_sysport_get_stats(struc
  		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;
 +
 +		if (s->stat_sizeof == sizeof(u64))
 +			do {
 +				start = u64_stats_fetch_begin_irq(syncp);
 +				data[i] = *(u64 *)p;
 +			} while (u64_stats_fetch_retry_irq(syncp, start));
 +		else
 +			data[i] = *(u32 *)p;
  		j++;
  	}