Module Name: src
Committed By: msaitoh
Date: Mon Jan 6 06:50:00 UTC 2020
Modified Files:
src/sys/arch/arm/omap: if_cpsw.c
src/sys/arch/arm/ti: if_cpsw.c
Log Message:
Add ETHER_LOCK() and ETHER_UNLOCK() to protect ec_multiaddrs.
XXX These drivers don't check whether enm_addrlo and enm_addrhi are the same
or not, so it won't work correctly if an multicast address entry has a range.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/omap/if_cpsw.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/ti/if_cpsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/omap/if_cpsw.c
diff -u src/sys/arch/arm/omap/if_cpsw.c:1.25 src/sys/arch/arm/omap/if_cpsw.c:1.26
--- src/sys/arch/arm/omap/if_cpsw.c:1.25 Wed May 29 06:17:27 2019
+++ src/sys/arch/arm/omap/if_cpsw.c Mon Jan 6 06:50:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.25 2019/05/29 06:17:27 msaitoh Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.26 2020/01/06 06:50:00 msaitoh Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.25 2019/05/29 06:17:27 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.26 2020/01/06 06:50:00 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1543,9 +1543,11 @@ cpsw_ale_update_addresses(struct cpsw_so
cpsw_ale_remove_all_mc_entries(sc);
/* Set other multicast addrs desired. */
+ ETHER_LOCK(ec);
LIST_FOREACH(ifma, &ec->ec_multiaddrs, enm_list) {
cpsw_ale_mc_entry_set(sc, ALE_PORT_MASK_ALL, ifma->enm_addrlo);
}
+ ETHER_UNLOCK(ec);
return 0;
}
Index: src/sys/arch/arm/ti/if_cpsw.c
diff -u src/sys/arch/arm/ti/if_cpsw.c:1.9 src/sys/arch/arm/ti/if_cpsw.c:1.10
--- src/sys/arch/arm/ti/if_cpsw.c:1.9 Sun Nov 24 09:37:05 2019
+++ src/sys/arch/arm/ti/if_cpsw.c Mon Jan 6 06:50:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.9 2019/11/24 09:37:05 skrll Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.10 2020/01/06 06:50:00 msaitoh Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.9 2019/11/24 09:37:05 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.10 2020/01/06 06:50:00 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1550,9 +1550,11 @@ cpsw_ale_update_addresses(struct cpsw_so
cpsw_ale_remove_all_mc_entries(sc);
/* Set other multicast addrs desired. */
+ ETHER_LOCK(ec);
LIST_FOREACH(ifma, &ec->ec_multiaddrs, enm_list) {
cpsw_ale_mc_entry_set(sc, ALE_PORT_MASK_ALL, ifma->enm_addrlo);
}
+ ETHER_UNLOCK(ec);
return 0;
}
