Merge branch 'fix-suse-16' into 'stable-1.6'

Driver fixes for openSUSE Leap 16.0

See merge request etherlab.org/ethercat!192

devices/genet/bcmgenet-6.12-ethercat.c

@@ -2459,7 +2459,11 @@ static int bcmgenet_rx_poll(struct napi_struct *napi, int budget)
 	if (ring->dim.use_dim) {
 		dim_update_sample(ring->dim.event_ctr, ring->dim.packets,
 				  ring->dim.bytes, &dim_sample);
+#ifdef CONFIG_SUSE_KERNEL
+		net_dim(&ring->dim.dim, &dim_sample);
+#else
 		net_dim(&ring->dim.dim, dim_sample);
+#endif
 	}
 
 	return work_done;

devices/igb/igb_main-6.12-ethercat.c

@@ -2513,6 +2513,9 @@ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
 			   struct net_device *dev,
 			   const unsigned char *addr, u16 vid,
 			   u16 flags,
+#ifdef CONFIG_SUSE_KERNEL
+			   bool *notified,
+#endif
 			   struct netlink_ext_ack *extack)
 {
 	/* guarantee we can provide a unique filter for the unicast address */