bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Driver fixes for openSUSE Leap 16.0

See merge request etherlab.org/ethercat!192
This commit is contained in:
Florian Pose 2026-03-26 17:45:44 +01:00
parent cf19168844 9c63faf50d
commit 15883228f9
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devices/genet/bcmgenet-6.12-ethercat.c
View File

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

3
devices/igb/igb_main-6.12-ethercat.c
View File

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