Module Name: src
Committed By: msaitoh
Date: Tue Mar 5 08:25:03 UTC 2019
Modified Files:
src/sys/arch/arm/omap: if_cpsw.c
src/sys/arch/arm/sunxi: sunxi_emac.c
src/sys/arch/arm/ti: if_cpsw.c
src/sys/arch/arm/xscale: ixp425_if_npe.c
src/sys/arch/i386/stand/efiboot: efinet.c
src/sys/arch/mips/sibyte/dev: sbmac.c
src/sys/arch/x86/pci: if_vmxreg.h
src/sys/dev/hyperv: if_hvn.c
src/sys/dev/pci: if_age.c if_alc.c if_ale.c if_bgereg.h if_bnxreg.h
if_casvar.h if_nfereg.h if_skreg.h if_tireg.h if_vge.c
src/sys/dev/pci/ixgbe: ixgbe_netbsd.h
src/sys/dev/pcmcia: if_malo_pcmcia.c
src/sys/dev/usb: if_auereg.h if_axenreg.h if_axereg.h if_cuereg.h
if_kuereg.h if_mue.c if_smsc.c if_udavreg.h if_upgt.c if_urlreg.h
if_urndis.c
src/sys/net: if_ether.h
src/sys/stand/efiboot: efinet.c
Log Message:
Centralize ETHER_ALIGN into net/if_ether.h. Note that this commit also changes
if_upgt.c's ETHER_ALIGN from 0 to 2.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/omap/if_cpsw.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/sunxi/sunxi_emac.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/if_cpsw.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/arm/xscale/ixp425_if_npe.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/stand/efiboot/efinet.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/mips/sibyte/dev/sbmac.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/pci/if_vmxreg.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/hyperv/if_hvn.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/if_alc.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_ale.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/pci/if_bgereg.h
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/if_bnxreg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_casvar.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/if_nfereg.h
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/if_skreg.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/if_tireg.h
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/pci/if_vge.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pcmcia/if_malo_pcmcia.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/if_auereg.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/if_axenreg.h \
src/sys/dev/usb/if_udavreg.h src/sys/dev/usb/if_urlreg.h
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/if_axereg.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/if_cuereg.h \
src/sys/dev/usb/if_kuereg.h src/sys/dev/usb/if_urndis.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/if_mue.c src/sys/dev/usb/if_smsc.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/usb/if_upgt.c
cvs rdiff -u -r1.76 -r1.77 src/sys/net/if_ether.h
cvs rdiff -u -r1.4 -r1.5 src/sys/stand/efiboot/efinet.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.22 src/sys/arch/arm/omap/if_cpsw.c:1.23
--- src/sys/arch/arm/omap/if_cpsw.c:1.22 Tue Jan 22 03:42:25 2019
+++ src/sys/arch/arm/omap/if_cpsw.c Tue Mar 5 08:25:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.22 2019/01/22 03:42:25 msaitoh Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.23 2019/03/05 08:25:01 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.22 2019/01/22 03:42:25 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.23 2019/03/05 08:25:01 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -78,8 +78,6 @@ __KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v
#include <arch/arm/omap/sitara_cmreg.h>
#include <arch/arm/omap/sitara_cm.h>
-#define ETHER_ALIGN (roundup2(ETHER_HDR_LEN, sizeof(uint32_t)) - ETHER_HDR_LEN)
-
#define CPSW_TXFRAGS 16
#define CPSW_CPPI_RAM_SIZE (0x2000)
Index: src/sys/arch/arm/sunxi/sunxi_emac.c
diff -u src/sys/arch/arm/sunxi/sunxi_emac.c:1.22 src/sys/arch/arm/sunxi/sunxi_emac.c:1.23
--- src/sys/arch/arm/sunxi/sunxi_emac.c:1.22 Mon Mar 4 11:35:38 2019
+++ src/sys/arch/arm/sunxi/sunxi_emac.c Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_emac.c,v 1.22 2019/03/04 11:35:38 jmcneill Exp $ */
+/* $NetBSD: sunxi_emac.c,v 1.23 2019/03/05 08:25:02 msaitoh Exp $ */
/*-
* Copyright (c) 2016-2017 Jared McNeill <[email protected]>
@@ -33,7 +33,7 @@
#include "opt_net_mpsafe.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.22 2019/03/04 11:35:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.23 2019/03/05 08:25:02 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -70,8 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c
#define EMAC_IFNAME "emac%d"
-#define ETHER_ALIGN 2
-
#define EMAC_LOCK(sc) mutex_enter(&(sc)->mtx)
#define EMAC_UNLOCK(sc) mutex_exit(&(sc)->mtx)
#define EMAC_ASSERT_LOCKED(sc) KASSERT(mutex_owned(&(sc)->mtx))
Index: src/sys/arch/arm/ti/if_cpsw.c
diff -u src/sys/arch/arm/ti/if_cpsw.c:1.3 src/sys/arch/arm/ti/if_cpsw.c:1.4
--- src/sys/arch/arm/ti/if_cpsw.c:1.3 Tue Jan 22 03:42:25 2019
+++ src/sys/arch/arm/ti/if_cpsw.c Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.3 2019/01/22 03:42:25 msaitoh Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.4 2019/03/05 08:25:02 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.3 2019/01/22 03:42:25 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.4 2019/03/05 08:25:02 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -82,8 +82,6 @@ __KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v
#include <arch/arm/omap/sitara_cmreg.h>
#include <arch/arm/omap/sitara_cm.h>
-#define ETHER_ALIGN (roundup2(ETHER_HDR_LEN, sizeof(uint32_t)) - ETHER_HDR_LEN)
-
#define CPSW_TXFRAGS 16
#define CPSW_CPPI_RAM_SIZE (0x2000)
Index: src/sys/arch/arm/xscale/ixp425_if_npe.c
diff -u src/sys/arch/arm/xscale/ixp425_if_npe.c:1.36 src/sys/arch/arm/xscale/ixp425_if_npe.c:1.37
--- src/sys/arch/arm/xscale/ixp425_if_npe.c:1.36 Tue Jan 22 03:42:25 2019
+++ src/sys/arch/arm/xscale/ixp425_if_npe.c Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_if_npe.c,v 1.36 2019/01/22 03:42:25 msaitoh Exp $ */
+/* $NetBSD: ixp425_if_npe.c,v 1.37 2019/03/05 08:25:02 msaitoh Exp $ */
/*-
* Copyright (c) 2006 Sam Leffler. All rights reserved.
@@ -28,7 +28,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.36 2019/01/22 03:42:25 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.37 2019/03/05 08:25:02 msaitoh Exp $");
/*
* Intel XScale NPE Ethernet driver.
@@ -235,10 +235,6 @@ static int npe_debug;
#define NPE_TXBUF 128
#define NPE_RXBUF 64
-#ifndef ETHER_ALIGN
-#define ETHER_ALIGN 2 /* XXX: Ditch this */
-#endif
-
#define MAC2UINT64(addr) (((uint64_t)addr[0] << 40) \
+ ((uint64_t)addr[1] << 32) \
+ ((uint64_t)addr[2] << 24) \
Index: src/sys/arch/i386/stand/efiboot/efinet.c
diff -u src/sys/arch/i386/stand/efiboot/efinet.c:1.2 src/sys/arch/i386/stand/efiboot/efinet.c:1.3
--- src/sys/arch/i386/stand/efiboot/efinet.c:1.2 Mon Sep 3 16:29:25 2018
+++ src/sys/arch/i386/stand/efiboot/efinet.c Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efinet.c,v 1.2 2018/09/03 16:29:25 riastradh Exp $ */
+/* $NetBSD: efinet.c,v 1.3 2019/03/05 08:25:02 msaitoh Exp $ */
/*-
* Copyright (c) 2001 Doug Rabson
@@ -40,10 +40,6 @@ __FBSDID("$FreeBSD: head/stand/efi/libef
#include <bootinfo.h>
#include "devopen.h"
-#ifndef ETHER_ALIGN
-#define ETHER_ALIGN 2
-#endif
-
#define ETHER_EXT_LEN (ETHER_HDR_LEN + ETHER_CRC_LEN + ETHER_ALIGN)
#if defined(DEBUG) || defined(ARP_DEBUG) || defined(BOOTP_DEBUG) || \
Index: src/sys/arch/mips/sibyte/dev/sbmac.c
diff -u src/sys/arch/mips/sibyte/dev/sbmac.c:1.54 src/sys/arch/mips/sibyte/dev/sbmac.c:1.55
--- src/sys/arch/mips/sibyte/dev/sbmac.c:1.54 Tue Feb 5 06:17:01 2019
+++ src/sys/arch/mips/sibyte/dev/sbmac.c Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sbmac.c,v 1.54 2019/02/05 06:17:01 msaitoh Exp $ */
+/* $NetBSD: sbmac.c,v 1.55 2019/03/05 08:25:02 msaitoh Exp $ */
/*
* Copyright 2000, 2001, 2004
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.54 2019/02/05 06:17:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.55 2019/03/05 08:25:02 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -122,8 +122,6 @@ typedef enum { sbmac_state_uninit, sbmac
#define SBMAC_MAX_TXDESCR 256 /* should be 1024 */
#define SBMAC_MAX_RXDESCR 256 /* should be 512 */
-#define ETHER_ALIGN 2
-
/* DMA Descriptor structure */
typedef struct sbdmadscr_s {
Index: src/sys/arch/x86/pci/if_vmxreg.h
diff -u src/sys/arch/x86/pci/if_vmxreg.h:1.2 src/sys/arch/x86/pci/if_vmxreg.h:1.3
--- src/sys/arch/x86/pci/if_vmxreg.h:1.2 Fri Nov 25 05:29:54 2016
+++ src/sys/arch/x86/pci/if_vmxreg.h Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vmxreg.h,v 1.2 2016/11/25 05:29:54 hikaru Exp $ */
+/* $NetBSD: if_vmxreg.h,v 1.3 2019/03/05 08:25:02 msaitoh Exp $ */
/* $OpenBSD: if_vmxreg.h,v 1.3 2013/08/28 10:19:19 reyk Exp $ */
/*
@@ -43,8 +43,6 @@ struct UPT1_RxStats {
uint64_t error;
} __packed;
-#define ETHER_ALIGN 2
-
/* interrupt moderation levels */
#define UPT1_IMOD_NONE 0 /* no moderation */
#define UPT1_IMOD_HIGHEST 7 /* least interrupts */
Index: src/sys/dev/hyperv/if_hvn.c
diff -u src/sys/dev/hyperv/if_hvn.c:1.1 src/sys/dev/hyperv/if_hvn.c:1.2
--- src/sys/dev/hyperv/if_hvn.c:1.1 Fri Feb 15 08:54:01 2019
+++ src/sys/dev/hyperv/if_hvn.c Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hvn.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $ */
+/* $NetBSD: if_hvn.c,v 1.2 2019/03/05 08:25:02 msaitoh Exp $ */
/* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.2 2019/03/05 08:25:02 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -68,10 +68,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1
#define EVL_PRIO_BITS 13
#endif
-#ifndef ETHER_ALIGN
-#define ETHER_ALIGN 2
-#endif
-
#define HVN_NVS_MSGSIZE 32
#define HVN_NVS_BUFSIZE PAGE_SIZE
Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.55 src/sys/dev/pci/if_age.c:1.56
--- src/sys/dev/pci/if_age.c:1.55 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/pci/if_age.c Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.55 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_age.c,v 1.56 2019/03/05 08:25:02 msaitoh Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.55 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.56 2019/03/05 08:25:02 msaitoh Exp $");
#include "vlan.h"
@@ -124,7 +124,6 @@ CFATTACH_DECL_NEW(age, sizeof(struct age
int agedebug = 0;
#define DPRINTF(x) do { if (agedebug) printf x; } while (0)
-#define ETHER_ALIGN 2
#define AGE_CSUM_FEATURES (M_CSUM_TCPv4 | M_CSUM_UDPv4)
static int
Index: src/sys/dev/pci/if_alc.c
diff -u src/sys/dev/pci/if_alc.c:1.30 src/sys/dev/pci/if_alc.c:1.31
--- src/sys/dev/pci/if_alc.c:1.30 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/pci/if_alc.c Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_alc.c,v 1.30 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_alc.c,v 1.31 2019/03/05 08:25:02 msaitoh Exp $ */
/* $OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $ */
/*-
* Copyright (c) 2009, Pyun YongHyeon <[email protected]>
@@ -175,7 +175,6 @@ CFATTACH_DECL_NEW(alc, sizeof(struct alc
int alcdebug = 0;
#define DPRINTF(x) do { if (alcdebug) printf x; } while (0)
-#define ETHER_ALIGN 2
#define ALC_CSUM_FEATURES (M_CSUM_TCPv4 | M_CSUM_UDPv4)
static int
Index: src/sys/dev/pci/if_ale.c
diff -u src/sys/dev/pci/if_ale.c:1.27 src/sys/dev/pci/if_ale.c:1.28
--- src/sys/dev/pci/if_ale.c:1.27 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/pci/if_ale.c Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ale.c,v 1.27 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_ale.c,v 1.28 2019/03/05 08:25:02 msaitoh Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <[email protected]>
@@ -32,7 +32,7 @@
/* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.27 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.28 2019/03/05 08:25:02 msaitoh Exp $");
#include "vlan.h"
@@ -124,7 +124,6 @@ CFATTACH_DECL_NEW(ale, sizeof(struct ale
int aledebug = 0;
#define DPRINTF(x) do { if (aledebug) printf x; } while (0)
-#define ETHER_ALIGN 2
#define ALE_CSUM_FEATURES (M_CSUM_TCPv4 | M_CSUM_UDPv4)
static int
Index: src/sys/dev/pci/if_bgereg.h
diff -u src/sys/dev/pci/if_bgereg.h:1.95 src/sys/dev/pci/if_bgereg.h:1.96
--- src/sys/dev/pci/if_bgereg.h:1.95 Wed Feb 20 17:00:20 2019
+++ src/sys/dev/pci/if_bgereg.h Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bgereg.h,v 1.95 2019/02/20 17:00:20 msaitoh Exp $ */
+/* $NetBSD: if_bgereg.h,v 1.96 2019/03/05 08:25:02 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
@@ -2629,8 +2629,6 @@ struct bge_gib {
* boundary.
*/
-#define ETHER_ALIGN 2
-
#define BGE_FRAMELEN ETHER_MAX_LEN
#define BGE_MAX_FRAMELEN 1536
#define BGE_JUMBO_FRAMELEN ETHER_MAX_LEN_JUMBO
Index: src/sys/dev/pci/if_bnxreg.h
diff -u src/sys/dev/pci/if_bnxreg.h:1.19 src/sys/dev/pci/if_bnxreg.h:1.20
--- src/sys/dev/pci/if_bnxreg.h:1.19 Sun Jun 3 10:01:22 2018
+++ src/sys/dev/pci/if_bnxreg.h Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bnxreg.h,v 1.19 2018/06/03 10:01:22 maxv Exp $ */
+/* $NetBSD: if_bnxreg.h,v 1.20 2019/03/05 08:25:02 msaitoh Exp $ */
/* $OpenBSD: if_bnxreg.h,v 1.33 2009/09/05 16:02:28 claudio Exp $ */
/*-
@@ -32,8 +32,6 @@
* $FreeBSD: src/sys/dev/bce/if_bcereg.h,v 1.4 2006/05/04 00:34:07 mjacob Exp $
*/
-#define ETHER_ALIGN 2
-
/* General controller flags -- bnx_flags element in bnx_softc */
#define BNX_PCIX_FLAG 0x01
#define BNX_PCI_32BIT_FLAG 0x02
Index: src/sys/dev/pci/if_casvar.h
diff -u src/sys/dev/pci/if_casvar.h:1.5 src/sys/dev/pci/if_casvar.h:1.6
--- src/sys/dev/pci/if_casvar.h:1.5 Tue Apr 14 20:32:36 2015
+++ src/sys/dev/pci/if_casvar.h Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_casvar.h,v 1.5 2015/04/14 20:32:36 riastradh Exp $ */
+/* $NetBSD: if_casvar.h,v 1.6 2019/03/05 08:25:02 msaitoh Exp $ */
/* $OpenBSD: if_casvar.h,v 1.6 2009/06/13 12:18:58 kettenis Exp $ */
/*
@@ -258,6 +258,4 @@ do { \
#define CAS_INTR_PCI 1
#define CAS_INTR_REG 2
-#define ETHER_ALIGN 2
-
#endif
Index: src/sys/dev/pci/if_nfereg.h
diff -u src/sys/dev/pci/if_nfereg.h:1.7 src/sys/dev/pci/if_nfereg.h:1.8
--- src/sys/dev/pci/if_nfereg.h:1.7 Thu Apr 17 19:12:26 2008
+++ src/sys/dev/pci/if_nfereg.h Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nfereg.h,v 1.7 2008/04/17 19:12:26 christos Exp $ */
+/* $NetBSD: if_nfereg.h,v 1.8 2019/03/05 08:25:02 msaitoh Exp $ */
/* $OpenBSD: if_nfereg.h,v 1.22 2007/12/05 08:30:33 jsg Exp $ */
/*-
@@ -25,8 +25,6 @@
#define NFE_RX_NEXTDESC(x) (((x) + 1) & (NFE_RX_RING_COUNT - 1))
#define NFE_TX_NEXTDESC(x) (((x) + 1) & (NFE_TX_RING_COUNT - 1))
-#define ETHER_ALIGN 2
-
#define NFE_JUMBO_FRAMELEN 9018
#define NFE_JUMBO_MTU (NFE_JUMBO_FRAMELEN - ETHER_HDR_LEN - ETHER_CRC_LEN)
Index: src/sys/dev/pci/if_skreg.h
diff -u src/sys/dev/pci/if_skreg.h:1.25 src/sys/dev/pci/if_skreg.h:1.26
--- src/sys/dev/pci/if_skreg.h:1.25 Fri Sep 14 18:46:47 2018
+++ src/sys/dev/pci/if_skreg.h Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_skreg.h,v 1.25 2018/09/14 18:46:47 jakllsch Exp $ */
+/* $NetBSD: if_skreg.h,v 1.26 2019/03/05 08:25:02 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -1764,7 +1764,6 @@ struct msk_status_desc {
#define SK_MAXUNIT 256
#define SK_TIMEOUT 1000
-#define ETHER_ALIGN 2
/* YUKON registers */
Index: src/sys/dev/pci/if_tireg.h
diff -u src/sys/dev/pci/if_tireg.h:1.20 src/sys/dev/pci/if_tireg.h:1.21
--- src/sys/dev/pci/if_tireg.h:1.20 Sat Oct 27 17:18:34 2012
+++ src/sys/dev/pci/if_tireg.h Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tireg.h,v 1.20 2012/10/27 17:18:34 chs Exp $ */
+/* $NetBSD: if_tireg.h,v 1.21 2019/03/05 08:25:02 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -766,8 +766,6 @@ struct ti_tx_desc {
* boundary.
*/
-#define ETHER_ALIGN 2
-
#define TI_PAGE_SIZE PAGE_SIZE
/*
Index: src/sys/dev/pci/if_vge.c
diff -u src/sys/dev/pci/if_vge.c:1.67 src/sys/dev/pci/if_vge.c:1.68
--- src/sys/dev/pci/if_vge.c:1.67 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/pci/if_vge.c Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.67 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_vge.c,v 1.68 2019/03/05 08:25:02 msaitoh Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.67 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.68 2019/03/05 08:25:02 msaitoh Exp $");
/*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -143,7 +143,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1
*
* See also comment in vge_encap().
*/
-#define ETHER_ALIGN 2
#ifdef __NO_STRICT_ALIGNMENT
#define VGE_RX_BUFSIZE MCLBYTES
Index: src/sys/dev/pci/ixgbe/ixgbe_netbsd.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_netbsd.h:1.10 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h:1.11
--- src/sys/dev/pci/ixgbe/ixgbe_netbsd.h:1.10 Fri Dec 21 07:13:30 2018
+++ src/sys/dev/pci/ixgbe/ixgbe_netbsd.h Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: ixgbe_netbsd.h,v 1.10 2018/12/21 07:13:30 msaitoh Exp $*/
+/*$NetBSD: ixgbe_netbsd.h,v 1.11 2019/03/05 08:25:02 msaitoh Exp $*/
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -50,8 +50,6 @@
#define IFCAP_HWCSUM (IFCAP_RXCSUM|IFCAP_TXCSUM)
-#define ETHER_ALIGN 2
-
struct ixgbe_dma_tag {
bus_dma_tag_t dt_dmat;
bus_size_t dt_alignment;
Index: src/sys/dev/pcmcia/if_malo_pcmcia.c
diff -u src/sys/dev/pcmcia/if_malo_pcmcia.c:1.20 src/sys/dev/pcmcia/if_malo_pcmcia.c:1.21
--- src/sys/dev/pcmcia/if_malo_pcmcia.c:1.20 Tue Jan 8 08:47:21 2019
+++ src/sys/dev/pcmcia/if_malo_pcmcia.c Tue Mar 5 08:25:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_malo_pcmcia.c,v 1.20 2019/01/08 08:47:21 msaitoh Exp $ */
+/* $NetBSD: if_malo_pcmcia.c,v 1.21 2019/03/05 08:25:02 msaitoh Exp $ */
/* $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.20 2019/01/08 08:47:21 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.21 2019/03/05 08:25:02 msaitoh Exp $");
#ifdef _MODULE
#include <sys/module.h>
@@ -1041,7 +1041,6 @@ cmalo_rx(struct malo_softc *sc)
memcpy(data + (ETHER_ADDR_LEN * 2), data + i, rxdesc->pkglen - i);
rxdesc->pkglen -= sizeof(struct llc);
-#define ETHER_ALIGN 2 /* XXX */
/* prepare mbuf */
m = m_devget(sc->sc_data + rxdesc->pkgoffset,
rxdesc->pkglen, ETHER_ALIGN, ifp);
Index: src/sys/dev/usb/if_auereg.h
diff -u src/sys/dev/usb/if_auereg.h:1.27 src/sys/dev/usb/if_auereg.h:1.28
--- src/sys/dev/usb/if_auereg.h:1.27 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_auereg.h Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_auereg.h,v 1.27 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_auereg.h,v 1.28 2019/03/05 08:25:03 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <[email protected]>. All rights reserved.
@@ -267,7 +267,6 @@ struct aue_softc {
};
#define AUE_TIMEOUT 1000
-#define ETHER_ALIGN 2
#define AUE_BUFSZ 1536
#define AUE_MIN_FRAMELEN 60
#define AUE_TX_TIMEOUT 10000 /* ms */
Index: src/sys/dev/usb/if_axenreg.h
diff -u src/sys/dev/usb/if_axenreg.h:1.11 src/sys/dev/usb/if_axenreg.h:1.12
--- src/sys/dev/usb/if_axenreg.h:1.11 Sun Feb 17 09:33:19 2019
+++ src/sys/dev/usb/if_axenreg.h Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axenreg.h,v 1.11 2019/02/17 09:33:19 rin Exp $ */
+/* $NetBSD: if_axenreg.h,v 1.12 2019/03/05 08:25:03 msaitoh Exp $ */
/* $OpenBSD: if_axenreg.h,v 1.1 2013/10/07 05:37:41 yuo Exp $ */
/*
@@ -305,5 +305,3 @@ struct axen_softc {
#define GET_MII(sc) (&(sc)->axen_mii)
#define GET_IFP(sc) (&(sc)->sc_if)
-
-#define ETHER_ALIGN 2
Index: src/sys/dev/usb/if_udavreg.h
diff -u src/sys/dev/usb/if_udavreg.h:1.11 src/sys/dev/usb/if_udavreg.h:1.12
--- src/sys/dev/usb/if_udavreg.h:1.11 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_udavreg.h Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udavreg.h,v 1.11 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_udavreg.h,v 1.12 2019/03/05 08:25:03 msaitoh Exp $ */
/* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */
/*
* Copyright (c) 2003
@@ -41,8 +41,6 @@
#define UDAV_TX_TIMEOUT 1000
#define UDAV_TIMEOUT 10000
-#define ETHER_ALIGN 2
-
/* Packet length */
#define UDAV_MAX_MTU 1536 /* XXX: max frame size is unknown */
Index: src/sys/dev/usb/if_urlreg.h
diff -u src/sys/dev/usb/if_urlreg.h:1.11 src/sys/dev/usb/if_urlreg.h:1.12
--- src/sys/dev/usb/if_urlreg.h:1.11 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_urlreg.h Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urlreg.h,v 1.11 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_urlreg.h,v 1.12 2019/03/05 08:25:03 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <[email protected]>. All rights reserved.
@@ -40,8 +40,6 @@
#define URL_TX_TIMEOUT 1000
#define URL_TIMEOUT 10000
-#define ETHER_ALIGN 2
-
/* Packet length */
#define URL_MAX_MTU 1536
Index: src/sys/dev/usb/if_axereg.h
diff -u src/sys/dev/usb/if_axereg.h:1.19 src/sys/dev/usb/if_axereg.h:1.20
--- src/sys/dev/usb/if_axereg.h:1.19 Sun Dec 4 10:07:06 2016
+++ src/sys/dev/usb/if_axereg.h Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axereg.h,v 1.19 2016/12/04 10:07:06 skrll Exp $ */
+/* $NetBSD: if_axereg.h,v 1.20 2019/03/05 08:25:03 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -450,8 +450,6 @@ struct axe_softc {
#define sc_if axe_ec.ec_if
};
-#define ETHER_ALIGN 2
-
#define AXE_IS_178_FAMILY(sc) \
((sc)->axe_flags & (AX772 | AX772A | AX772B | AX178))
Index: src/sys/dev/usb/if_cuereg.h
diff -u src/sys/dev/usb/if_cuereg.h:1.20 src/sys/dev/usb/if_cuereg.h:1.21
--- src/sys/dev/usb/if_cuereg.h:1.20 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_cuereg.h Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cuereg.h,v 1.20 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_cuereg.h,v 1.21 2019/03/05 08:25:03 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <[email protected]>. All rights reserved.
@@ -118,7 +118,6 @@
#define CUE_MCAST_TABLE_LEN 64
#define CUE_TIMEOUT 1000
-#define ETHER_ALIGN 2
#define CUE_BUFSZ 1536
#define CUE_MIN_FRAMELEN 60
#define CUE_RX_FRAMES 1
Index: src/sys/dev/usb/if_kuereg.h
diff -u src/sys/dev/usb/if_kuereg.h:1.20 src/sys/dev/usb/if_kuereg.h:1.21
--- src/sys/dev/usb/if_kuereg.h:1.20 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_kuereg.h Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kuereg.h,v 1.20 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_kuereg.h,v 1.21 2019/03/05 08:25:03 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <[email protected]>. All rights reserved.
@@ -116,7 +116,6 @@ struct kue_ether_desc {
#define KUE_RXFILT_MULTICAST 0x0010
#define KUE_TIMEOUT 1000
-#define ETHER_ALIGN 2
#define KUE_BUFSZ 1536
#define KUE_MIN_FRAMELEN 60
Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.20 src/sys/dev/usb/if_urndis.c:1.21
--- src/sys/dev/usb/if_urndis.c:1.20 Thu Feb 14 03:33:55 2019
+++ src/sys/dev/usb/if_urndis.c Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndis.c,v 1.20 2019/02/14 03:33:55 nonaka Exp $ */
+/* $NetBSD: if_urndis.c,v 1.21 2019/03/05 08:25:03 msaitoh Exp $ */
/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
/*
@@ -21,7 +21,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.20 2019/02/14 03:33:55 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.21 2019/03/05 08:25:03 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -112,7 +112,6 @@ struct urndis_softc {
#define DEVNAME(sc) (device_xname(sc->sc_dev))
-#define ETHER_ALIGN 2
#define URNDIS_RESPONSE_LEN 0x400
Index: src/sys/dev/usb/if_mue.c
diff -u src/sys/dev/usb/if_mue.c:1.42 src/sys/dev/usb/if_mue.c:1.43
--- src/sys/dev/usb/if_mue.c:1.42 Tue Mar 5 08:17:44 2019
+++ src/sys/dev/usb/if_mue.c Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mue.c,v 1.42 2019/03/05 08:17:44 martin Exp $ */
+/* $NetBSD: if_mue.c,v 1.43 2019/03/05 08:25:03 msaitoh Exp $ */
/* $OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $ */
/*
@@ -20,7 +20,7 @@
/* Driver for Microchip LAN7500/LAN7800 chipsets. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.42 2019/03/05 08:17:44 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.43 2019/03/05 08:25:03 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -184,8 +184,6 @@ static struct mbuf *mue_newbuf(void);
#define ETHER_IS_ZERO(addr) \
(!(addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5]))
-#define ETHER_ALIGN 2
-
CFATTACH_DECL_NEW(mue, sizeof(struct mue_softc), mue_match, mue_attach,
mue_detach, mue_activate);
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.42 src/sys/dev/usb/if_smsc.c:1.43
--- src/sys/dev/usb/if_smsc.c:1.42 Sat Feb 2 19:02:59 2019
+++ src/sys/dev/usb/if_smsc.c Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.42 2019/02/02 19:02:59 dholland Exp $ */
+/* $NetBSD: if_smsc.c,v 1.43 2019/03/05 08:25:03 msaitoh Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.42 2019/02/02 19:02:59 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.43 2019/03/05 08:25:03 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -110,7 +110,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v
int smsc_debug = 0;
#endif
-#define ETHER_ALIGN 2
/*
* Various supported device vendors/products.
*/
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.23 src/sys/dev/usb/if_upgt.c:1.24
--- src/sys/dev/usb/if_upgt.c:1.23 Thu Nov 15 10:56:30 2018
+++ src/sys/dev/usb/if_upgt.c Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.23 2018/11/15 10:56:30 maxv Exp $ */
+/* $NetBSD: if_upgt.c,v 1.24 2019/03/05 08:25:03 msaitoh Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.23 2018/11/15 10:56:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.24 2019/03/05 08:25:03 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1841,7 +1841,6 @@ upgt_rx(struct upgt_softc *sc, uint8_t *
rxdesc = (struct upgt_lmac_rx_desc *)data;
/* create mbuf which is suitable for strict alignment archs */
-#define ETHER_ALIGN 0
m = m_devget(rxdesc->data, pkglen, ETHER_ALIGN, ifp);
if (m == NULL) {
DPRINTF(1, "%s: could not create RX mbuf\n",
Index: src/sys/net/if_ether.h
diff -u src/sys/net/if_ether.h:1.76 src/sys/net/if_ether.h:1.77
--- src/sys/net/if_ether.h:1.76 Fri Dec 21 04:43:17 2018
+++ src/sys/net/if_ether.h Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ether.h,v 1.76 2018/12/21 04:43:17 msaitoh Exp $ */
+/* $NetBSD: if_ether.h,v 1.77 2019/03/05 08:25:03 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -66,6 +66,14 @@
#define ETHER_PPPOE_ENCAP_LEN 8 /* length of PPPoE encapsulation */
/*
+ * Mbuf adjust factor to force 32-bit alignment of IP header.
+ * Drivers should do m_adj(m, ETHER_ALIGN) when setting up a
+ * receive so the upper layers get the IP header properly aligned
+ * past the 14-byte Ethernet header.
+ */
+#define ETHER_ALIGN 2 /* driver adjust for IP hdr alignment */
+
+/*
* Ethernet address - 6 octets
* this is only used by the ethers(3) functions.
*/
Index: src/sys/stand/efiboot/efinet.c
diff -u src/sys/stand/efiboot/efinet.c:1.4 src/sys/stand/efiboot/efinet.c:1.5
--- src/sys/stand/efiboot/efinet.c:1.4 Thu Nov 15 23:52:33 2018
+++ src/sys/stand/efiboot/efinet.c Tue Mar 5 08:25:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efinet.c,v 1.4 2018/11/15 23:52:33 jmcneill Exp $ */
+/* $NetBSD: efinet.c,v 1.5 2019/03/05 08:25:03 msaitoh Exp $ */
/*-
* Copyright (c) 2001 Doug Rabson
@@ -38,10 +38,6 @@
#include "devopen.h"
-#ifndef ETHER_ALIGN
-#define ETHER_ALIGN 2
-#endif
-
#define ETHER_EXT_LEN (ETHER_HDR_LEN + ETHER_CRC_LEN + ETHER_ALIGN)
#if defined(DEBUG) || defined(ARP_DEBUG) || defined(BOOTP_DEBUG) || \
