Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Three cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-01 17:42:05 -07:00
parent 4cc5b44b29 138e4ad67a
commit 6026e043d0
359 changed files with 2442 additions and 1663 deletions
--- a/drivers/net/dsa/bcm_sf2.h
+++ b/drivers/net/dsa/bcm_sf2.h
@@ -72,6 +72,7 @@ struct bcm_sf2_priv {
 	u32 				type;
 	const u16			*reg_offsets;
 	unsigned int			core_reg_align;
+	unsigned int			num_cfp_rules;

 	/* spinlock protecting access to the indirect registers */
 	spinlock_t			indir_lock;