Module Name: src
Committed By: jdolecek
Date: Tue Jun 12 21:36:34 UTC 2018
Modified Files:
src/sys/dev/pci: if_msk.c if_sk.c if_skreg.h
Log Message:
move SK_HASH_BITS to if_skreg.h and reuse in if_msk.c (from OpenBSD)
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/pci/if_sk.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/if_skreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.60 src/sys/dev/pci/if_msk.c:1.61
--- src/sys/dev/pci/if_msk.c:1.60 Tue Jun 12 20:27:54 2018
+++ src/sys/dev/pci/if_msk.c Tue Jun 12 21:36:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.60 2018/06/12 20:27:54 jdolecek Exp $ */
+/* $NetBSD: if_msk.c,v 1.61 2018/06/12 21:36:34 jdolecek Exp $ */
/* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.60 2018/06/12 20:27:54 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.61 2018/06/12 21:36:34 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -329,8 +329,6 @@ msk_miibus_statchg(struct ifnet *ifp)
SK_YU_READ_2(sc_if, YUKON_GPCR)));
}
-#define HASH_BITS 6
-
void
msk_setfilt(struct sk_if_softc *sc_if, void *addrv, int slot)
{
@@ -381,7 +379,7 @@ allmulti:
goto allmulti;
}
h = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN) &
- ((1 << HASH_BITS) - 1);
+ ((1 << SK_HASH_BITS) - 1);
if (h < 32)
hashes[0] |= (1 << h);
else
Index: src/sys/dev/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.85 src/sys/dev/pci/if_sk.c:1.86
--- src/sys/dev/pci/if_sk.c:1.85 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/pci/if_sk.c Tue Jun 12 21:36:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.85 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: if_sk.c,v 1.86 2018/06/12 21:36:34 jdolecek Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.85 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.86 2018/06/12 21:36:34 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -552,8 +552,6 @@ sk_marv_miibus_statchg(struct ifnet *ifp
YUKON_GPCR)));
}
-#define SK_HASH_BITS 6
-
u_int32_t
sk_xmac_hash(void *addr)
{
Index: src/sys/dev/pci/if_skreg.h
diff -u src/sys/dev/pci/if_skreg.h:1.17 src/sys/dev/pci/if_skreg.h:1.18
--- src/sys/dev/pci/if_skreg.h:1.17 Tue Jun 12 20:27:54 2018
+++ src/sys/dev/pci/if_skreg.h Tue Jun 12 21:36:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_skreg.h,v 1.17 2018/06/12 20:27:54 jdolecek Exp $ */
+/* $NetBSD: if_skreg.h,v 1.18 2018/06/12 21:36:34 jdolecek Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -2345,4 +2345,6 @@ struct msk_status_desc {
#define XM_RESAB_FDMODESEL 0x0020
#define XM_RESAB_HDMODESEL 0x0040
#define XM_RESAB_PAUSEBITS 0x0180
+
+#define SK_HASH_BITS 6
#endif /* _DEV_PCI_IF_SKREG_H_ */
