| Message ID | 4170130535e4ea14c66f8510042577be21941f4d.1375387593.git.joe@perches.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Thu, Aug 1, 2013 at 1:14 PM, Joe Perches <joe@perches.com> wrote: > diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.h b/drivers/net/ethernet/pasemi/pasemi_mac.h > index e2f4efa..649fdb4 100644 > --- a/drivers/net/ethernet/pasemi/pasemi_mac.h > +++ b/drivers/net/ethernet/pasemi/pasemi_mac.h > @@ -79,11 +79,11 @@ struct pasemi_mac { > int last_cs; > int num_cs; > u32 dma_if; > - u8 type; > #define MAC_TYPE_GMAC 1 > #define MAC_TYPE_XAUI 2 > > - u8 mac_addr[6]; > + u8 mac_addr[ETH_ALEN]; > + u8 type; Just promote 'type' to u32 instead, saves you from moving the #defines down, etc, etc. -Olof
On Thu, Aug 01, 2013 at 01:31:09PM -0700, Olof Johansson wrote: > Hi, > > On Thu, Aug 1, 2013 at 1:14 PM, Joe Perches <joe@perches.com> wrote: > > > diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.h b/drivers/net/ethernet/pasemi/pasemi_mac.h > > index e2f4efa..649fdb4 100644 > > --- a/drivers/net/ethernet/pasemi/pasemi_mac.h > > +++ b/drivers/net/ethernet/pasemi/pasemi_mac.h > > @@ -79,11 +79,11 @@ struct pasemi_mac { > > int last_cs; > > int num_cs; > > u32 dma_if; > > - u8 type; > > #define MAC_TYPE_GMAC 1 > > #define MAC_TYPE_XAUI 2 > > > > - u8 mac_addr[6]; > > + u8 mac_addr[ETH_ALEN]; > > + u8 type; > > Just promote 'type' to u32 instead, saves you from moving the #defines > down, etc, etc. There's a more fundamental question which has to be asked: what is the point of moving that in the first place?
On Thu, 2013-08-01 at 21:33 +0100, Russell King - ARM Linux wrote: > On Thu, Aug 01, 2013 at 01:31:09PM -0700, Olof Johansson wrote: > > Hi, Hi all. > > On Thu, Aug 1, 2013 at 1:14 PM, Joe Perches <joe@perches.com> wrote: > > > diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.h b/drivers/net/ethernet/pasemi/pasemi_mac.h [] > > > @@ -79,11 +79,11 @@ struct pasemi_mac { > > > int last_cs; > > > int num_cs; > > > u32 dma_if; > > > - u8 type; > > > #define MAC_TYPE_GMAC 1 > > > #define MAC_TYPE_XAUI 2 > > > > > > - u8 mac_addr[6]; > > > + u8 mac_addr[ETH_ALEN]; > > > + u8 type; > > > > Just promote 'type' to u32 instead, saves you from moving the #defines > > down, etc, etc. type is already u8, why change it? That would also change struct size. > There's a more fundamental question which has to be asked: what is the > point of moving that in the first place? Some is_<foo>_ether_addr tests assume __aligned(2) by a casting char * to u16/be16 * and dereferencing. see patch 0/3 and include/linux/etherdevice.h
On Thu, Aug 01, 2013 at 01:55:28PM -0700, Joe Perches wrote: > On Thu, 2013-08-01 at 21:33 +0100, Russell King - ARM Linux wrote: > > On Thu, Aug 01, 2013 at 01:31:09PM -0700, Olof Johansson wrote: > > > Hi, > > Hi all. > > > > On Thu, Aug 1, 2013 at 1:14 PM, Joe Perches <joe@perches.com> wrote: > > > > diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.h b/drivers/net/ethernet/pasemi/pasemi_mac.h > [] > > > > @@ -79,11 +79,11 @@ struct pasemi_mac { > > > > int last_cs; > > > > int num_cs; > > > > u32 dma_if; > > > > - u8 type; > > > > #define MAC_TYPE_GMAC 1 > > > > #define MAC_TYPE_XAUI 2 > > > > > > > > - u8 mac_addr[6]; > > > > + u8 mac_addr[ETH_ALEN]; > > > > + u8 type; > > > > > > Just promote 'type' to u32 instead, saves you from moving the #defines > > > down, etc, etc. > > type is already u8, why change it? > That would also change struct size. > > > There's a more fundamental question which has to be asked: what is the > > point of moving that in the first place? > > Some is_<foo>_ether_addr tests assume __aligned(2) > by a casting char * to u16/be16 * and dereferencing. > > see patch 0/3 and include/linux/etherdevice.h This seems rather obscure - I mean, it's not obvious to driver authors that should be the case. Would it not be better to make this a little more obvious somehow? Maybe __aligned(2) against mac_addr? Or maybe have a debugging check for it?
On Thu, 2013-08-01 at 21:58 +0100, Russell King - ARM Linux wrote: > On Thu, Aug 01, 2013 at 01:55:28PM -0700, Joe Perches wrote: > > On Thu, 2013-08-01 at 21:33 +0100, Russell King - ARM Linux wrote: > > > On Thu, Aug 01, 2013 at 01:31:09PM -0700, Olof Johansson wrote: > > > > On Thu, Aug 1, 2013 at 1:14 PM, Joe Perches <joe@perches.com> wrote: > > > > > diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.h b/drivers/net/ethernet/pasemi/pasemi_mac.h > > [] > > > > > @@ -79,11 +79,11 @@ struct pasemi_mac { > > > > > int last_cs; > > > > > int num_cs; > > > > > u32 dma_if; > > > > > - u8 type; > > > > > #define MAC_TYPE_GMAC 1 > > > > > #define MAC_TYPE_XAUI 2 > > > > > > > > > > - u8 mac_addr[6]; > > > > > + u8 mac_addr[ETH_ALEN]; > > > > > + u8 type; > > > > > > > > Just promote 'type' to u32 instead, saves you from moving the #defines > > > > down, etc, etc. > > > > type is already u8, why change it? > > That would also change struct size. > > > > > There's a more fundamental question which has to be asked: what is the > > > point of moving that in the first place? > > > > Some is_<foo>_ether_addr tests assume __aligned(2) > > by a casting char * to u16/be16 * and dereferencing. > > > > see patch 0/3 and include/linux/etherdevice.h > > This seems rather obscure - I mean, it's not obvious to driver authors > that should be the case. Would it not be better to make this a little > more obvious somehow? Maybe __aligned(2) against mac_addr? Or > maybe have a debugging check for it? That'd be for David Miller (cc'd). I believe he's argued in the past that any alignment check for mac addresses was unnecessary. For all I know it really might not matter because pasemi can successfully dereference a ushort against an odd char pointer. I just noticed it and thought it'd be better moved.
On Thu, Aug 01, 2013 at 02:04:47PM -0700, Joe Perches wrote: > On Thu, 2013-08-01 at 21:58 +0100, Russell King - ARM Linux wrote: > > This seems rather obscure - I mean, it's not obvious to driver authors > > that should be the case. Would it not be better to make this a little > > more obvious somehow? Maybe __aligned(2) against mac_addr? Or > > maybe have a debugging check for it? > > That'd be for David Miller (cc'd). > > I believe he's argued in the past that any alignment check > for mac addresses was unnecessary. > > For all I know it really might not matter because pasemi > can successfully dereference a ushort against an odd char > pointer. > > I just noticed it and thought it'd be better moved. As can ARM too for years now - either in hardware or via fixup for kernel code.
From: Russell King - ARM Linux <linux@arm.linux.org.uk> Date: Thu, 1 Aug 2013 22:06:18 +0100 > On Thu, Aug 01, 2013 at 02:04:47PM -0700, Joe Perches wrote: >> On Thu, 2013-08-01 at 21:58 +0100, Russell King - ARM Linux wrote: >> > This seems rather obscure - I mean, it's not obvious to driver authors >> > that should be the case. Would it not be better to make this a little >> > more obvious somehow? Maybe __aligned(2) against mac_addr? Or >> > maybe have a debugging check for it? >> >> That'd be for David Miller (cc'd). >> >> I believe he's argued in the past that any alignment check >> for mac addresses was unnecessary. >> >> For all I know it really might not matter because pasemi >> can successfully dereference a ushort against an odd char >> pointer. >> >> I just noticed it and thought it'd be better moved. > > As can ARM too for years now - either in hardware or via fixup for > kernel code. But probably not a good idea if it's done in a fast path.
On Thu, Aug 1, 2013 at 2:10 PM, David Miller <davem@davemloft.net> wrote: > From: Russell King - ARM Linux <linux@arm.linux.org.uk> > Date: Thu, 1 Aug 2013 22:06:18 +0100 > >> On Thu, Aug 01, 2013 at 02:04:47PM -0700, Joe Perches wrote: >>> On Thu, 2013-08-01 at 21:58 +0100, Russell King - ARM Linux wrote: >>> > This seems rather obscure - I mean, it's not obvious to driver authors >>> > that should be the case. Would it not be better to make this a little >>> > more obvious somehow? Maybe __aligned(2) against mac_addr? Or >>> > maybe have a debugging check for it? >>> >>> That'd be for David Miller (cc'd). >>> >>> I believe he's argued in the past that any alignment check >>> for mac addresses was unnecessary. >>> >>> For all I know it really might not matter because pasemi >>> can successfully dereference a ushort against an odd char >>> pointer. >>> >>> I just noticed it and thought it'd be better moved. >> >> As can ARM too for years now - either in hardware or via fixup for >> kernel code. > > But probably not a good idea if it's done in a fast path. This particular driver is for the PA Semi chips, and I very much doubt that compatible hardware will ever show up anywhere else; they're fairly dependent on the I/O architecture of the chip and Apple has not brought those aspects forward in their ARM chips, as far as I know. So, you might as well leave the code alone for now. It's not used on fast path, and the system definitely handles unaligned accesses for this -- it has for years already. -Olof
From: Olof Johansson <olof@lixom.net> Date: Thu, 1 Aug 2013 14:24:32 -0700 > So, you might as well leave the code alone for now. It's not used on > fast path, and the system definitely handles unaligned accesses for > this -- it has for years already. Fair enough, Joe please respin.
Convert the uses mac addresses to ETH_ALEN so it's easier to find and verify where mac addresses need to be __aligned(2) Change in V2: - Remove include/acpi/actbl2.h conversion It's a file copied from outside ACPI sources Changes in V3: - Don't move the pasemi_mac.h mac address to be aligned(2) Just note that it's unaligned. Joe Perches (3): uapi: Convert some uses of 6 to ETH_ALEN include: Convert ethernet mac address declarations to use ETH_ALEN ethernet: Convert mac address uses of 6 to ETH_ALEN drivers/net/ethernet/8390/ax88796.c | 4 +- drivers/net/ethernet/amd/pcnet32.c | 6 +-- drivers/net/ethernet/broadcom/cnic_if.h | 6 +-- drivers/net/ethernet/dec/tulip/tulip_core.c | 8 +-- drivers/net/ethernet/i825xx/sun3_82586.h | 4 +- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- drivers/net/ethernet/nuvoton/w90p910_ether.c | 4 +- drivers/net/ethernet/pasemi/pasemi_mac.c | 13 ++--- drivers/net/ethernet/pasemi/pasemi_mac.h | 2 +- drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 4 +- drivers/net/ethernet/qlogic/qlge/qlge.h | 2 +- include/linux/dm9000.h | 4 +- include/linux/fs_enet_pd.h | 3 +- include/linux/ieee80211.h | 59 +++++++++++----------- include/linux/mlx4/device.h | 11 ++-- include/linux/mlx4/qp.h | 5 +- include/linux/mv643xx_eth.h | 3 +- include/linux/sh_eth.h | 3 +- include/linux/smsc911x.h | 3 +- include/linux/uwb/spec.h | 5 +- include/media/tveeprom.h | 4 +- include/net/irda/irlan_common.h | 3 +- include/uapi/linux/dn.h | 3 +- include/uapi/linux/if_bridge.h | 3 +- include/uapi/linux/netfilter_bridge/ebt_802_3.h | 5 +- include/uapi/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 3 +- include/uapi/linux/virtio_net.h | 2 +- include/uapi/linux/wimax/i2400m.h | 4 +- 28 files changed, 99 insertions(+), 79 deletions(-)
From: Joe Perches <joe@perches.com> Date: Thu, 1 Aug 2013 16:17:46 -0700 > Convert the uses mac addresses to ETH_ALEN so > it's easier to find and verify where mac addresses > need to be __aligned(2) Series applied to net-next, thanks.
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c index e1d2643..b7232a9 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c @@ -707,7 +707,7 @@ static int ax_init_dev(struct net_device *dev) #ifdef CONFIG_AX88796_93CX6 if (ax->plat->flags & AXFLG_HAS_93CX6) { - unsigned char mac_addr[6]; + unsigned char mac_addr[ETH_ALEN]; struct eeprom_93cx6 eeprom; eeprom.data = ei_local; @@ -719,7 +719,7 @@ static int ax_init_dev(struct net_device *dev) (__le16 __force *)mac_addr, sizeof(mac_addr) >> 1); - memcpy(dev->dev_addr, mac_addr, 6); + memcpy(dev->dev_addr, mac_addr, ETH_ALEN); } #endif if (ax->plat->wordlength == 2) { diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c index ed21307..2d8e288 100644 --- a/drivers/net/ethernet/amd/pcnet32.c +++ b/drivers/net/ethernet/amd/pcnet32.c @@ -1521,7 +1521,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) char *chipname; struct net_device *dev; const struct pcnet32_access *a = NULL; - u8 promaddr[6]; + u8 promaddr[ETH_ALEN]; int ret = -ENODEV; /* reset the chip */ @@ -1665,10 +1665,10 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) } /* read PROM address and compare with CSR address */ - for (i = 0; i < 6; i++) + for (i = 0; i < ETH_ALEN; i++) promaddr[i] = inb(ioaddr + i); - if (memcmp(promaddr, dev->dev_addr, 6) || + if (memcmp(promaddr, dev->dev_addr, ETH_ALEN) || !is_valid_ether_addr(dev->dev_addr)) { if (is_valid_ether_addr(promaddr)) { if (pcnet32_debug & NETIF_MSG_PROBE) { diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h index 82a0312..95aff76 100644 --- a/drivers/net/ethernet/broadcom/cnic_if.h +++ b/drivers/net/ethernet/broadcom/cnic_if.h @@ -238,8 +238,8 @@ struct cnic_sock { u16 src_port; u16 dst_port; u16 vlan_id; - unsigned char old_ha[6]; - unsigned char ha[6]; + unsigned char old_ha[ETH_ALEN]; + unsigned char ha[ETH_ALEN]; u32 mtu; u32 cid; u32 l5_cid; @@ -308,7 +308,7 @@ struct cnic_dev { #define CNIC_F_BNX2_CLASS 3 #define CNIC_F_BNX2X_CLASS 4 atomic_t ref_count; - u8 mac_addr[6]; + u8 mac_addr[ETH_ALEN]; int max_iscsi_conn; int max_fcoe_conn; diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c index c94152f..4e8cfa2 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c @@ -1304,7 +1304,9 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { struct tulip_private *tp; /* See note below on the multiport cards. */ - static unsigned char last_phys_addr[6] = {0x00, 'L', 'i', 'n', 'u', 'x'}; + static unsigned char last_phys_addr[ETH_ALEN] = { + 0x00, 'L', 'i', 'n', 'u', 'x' + }; static int last_irq; static int multiport_cnt; /* For four-port boards w/one EEPROM */ int i, irq; @@ -1627,8 +1629,8 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->dev_addr[i] = last_phys_addr[i] + 1; #if defined(CONFIG_SPARC) addr = of_get_property(dp, "local-mac-address", &len); - if (addr && len == 6) - memcpy(dev->dev_addr, addr, 6); + if (addr && len == ETH_ALEN) + memcpy(dev->dev_addr, addr, ETH_ALEN); #endif #if defined(__i386__) || defined(__x86_64__) /* Patch up x86 BIOS bug. */ if (last_irq) diff --git a/drivers/net/ethernet/i825xx/sun3_82586.h b/drivers/net/ethernet/i825xx/sun3_82586.h index 93346f0..79aef68 100644 --- a/drivers/net/ethernet/i825xx/sun3_82586.h +++ b/drivers/net/ethernet/i825xx/sun3_82586.h @@ -133,8 +133,8 @@ struct rfd_struct unsigned char last; /* Bit15,Last Frame on List / Bit14,suspend */ unsigned short next; /* linkoffset to next RFD */ unsigned short rbd_offset; /* pointeroffset to RBD-buffer */ - unsigned char dest[6]; /* ethernet-address, destination */ - unsigned char source[6]; /* ethernet-address, source */ + unsigned char dest[ETH_ALEN]; /* ethernet-address, destination */ + unsigned char source[ETH_ALEN]; /* ethernet-address, source */ unsigned short length; /* 802.3 frame-length */ unsigned short zero_dummy; /* dummy */ }; diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 967bae8..d4cdf4d 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -244,7 +244,7 @@ struct myri10ge_priv { int fw_ver_minor; int fw_ver_tiny; int adopted_rx_filter_bug; - u8 mac_addr[6]; /* eeprom mac address */ + u8 mac_addr[ETH_ALEN]; /* eeprom mac address */ unsigned long serial_number; int vendor_specific_offset; int fw_multicast_support; diff --git a/drivers/net/ethernet/nuvoton/w90p910_ether.c b/drivers/net/ethernet/nuvoton/w90p910_ether.c index e88bdb1..dcfe58f 100644 --- a/drivers/net/ethernet/nuvoton/w90p910_ether.c +++ b/drivers/net/ethernet/nuvoton/w90p910_ether.c @@ -922,7 +922,7 @@ static void __init get_mac_address(struct net_device *dev) { struct w90p910_ether *ether = netdev_priv(dev); struct platform_device *pdev; - char addr[6]; + char addr[ETH_ALEN]; pdev = ether->pdev; @@ -934,7 +934,7 @@ static void __init get_mac_address(struct net_device *dev) addr[5] = 0xa8; if (is_valid_ether_addr(addr)) - memcpy(dev->dev_addr, &addr, 0x06); + memcpy(dev->dev_addr, &addr, ETH_ALEN); else dev_err(&pdev->dev, "invalid mac address\n"); } diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c index a5f0b5d..f21ae7b 100644 --- a/drivers/net/ethernet/pasemi/pasemi_mac.c +++ b/drivers/net/ethernet/pasemi/pasemi_mac.c @@ -191,7 +191,7 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac) struct device_node *dn = pci_device_to_OF_node(pdev); int len; const u8 *maddr; - u8 addr[6]; + u8 addr[ETH_ALEN]; if (!dn) { dev_dbg(&pdev->dev, @@ -201,8 +201,8 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac) maddr = of_get_property(dn, "local-mac-address", &len); - if (maddr && len == 6) { - memcpy(mac->mac_addr, maddr, 6); + if (maddr && len == ETH_ALEN) { + memcpy(mac->mac_addr, maddr, ETH_ALEN); return 0; } @@ -219,14 +219,15 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac) return -ENOENT; } - if (sscanf(maddr, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &addr[0], - &addr[1], &addr[2], &addr[3], &addr[4], &addr[5]) != 6) { + if (sscanf(maddr, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", + &addr[0], &addr[1], &addr[2], &addr[3], &addr[4], &addr[5]) + != ETH_ALEN) { dev_warn(&pdev->dev, "can't parse mac address, not configuring\n"); return -EINVAL; } - memcpy(mac->mac_addr, addr, 6); + memcpy(mac->mac_addr, addr, ETH_ALEN); return 0; } diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.h b/drivers/net/ethernet/pasemi/pasemi_mac.h index e2f4efa..649fdb4 100644 --- a/drivers/net/ethernet/pasemi/pasemi_mac.h +++ b/drivers/net/ethernet/pasemi/pasemi_mac.h @@ -79,11 +79,11 @@ struct pasemi_mac { int last_cs; int num_cs; u32 dma_if; - u8 type; #define MAC_TYPE_GMAC 1 #define MAC_TYPE_XAUI 2 - u8 mac_addr[6]; + u8 mac_addr[ETH_ALEN]; + u8 type; struct net_lro_mgr lro_mgr; struct net_lro_desc lro_desc[MAX_LRO_DESCRIPTORS]; diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c index 9fbb1cd..8375cbd 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c @@ -536,10 +536,10 @@ static void netxen_p2_nic_set_multi(struct net_device *netdev) { struct netxen_adapter *adapter = netdev_priv(netdev); struct netdev_hw_addr *ha; - u8 null_addr[6]; + u8 null_addr[ETH_ALEN]; int i; - memset(null_addr, 0, 6); + memset(null_addr, 0, ETH_ALEN); if (netdev->flags & IFF_PROMISC) { diff --git a/drivers/net/ethernet/qlogic/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h index 7e8d682..8994337 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge.h +++ b/drivers/net/ethernet/qlogic/qlge/qlge.h @@ -2149,7 +2149,7 @@ struct ql_adapter { struct timer_list timer; atomic_t lb_count; /* Keep local copy of current mac address. */ - char current_mac_addr[6]; + char current_mac_addr[ETH_ALEN]; }; /*
Use the normal #define to help grep find mac addresses and ensure that addresses are aligned. Move one address in pasemi_mac.h for alignment. Signed-off-by: Joe Perches <joe@perches.com> --- drivers/net/ethernet/8390/ax88796.c | 4 ++-- drivers/net/ethernet/amd/pcnet32.c | 6 +++--- drivers/net/ethernet/broadcom/cnic_if.h | 6 +++--- drivers/net/ethernet/dec/tulip/tulip_core.c | 8 +++++--- drivers/net/ethernet/i825xx/sun3_82586.h | 4 ++-- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- drivers/net/ethernet/nuvoton/w90p910_ether.c | 4 ++-- drivers/net/ethernet/pasemi/pasemi_mac.c | 13 +++++++------ drivers/net/ethernet/pasemi/pasemi_mac.h | 4 ++-- drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 4 ++-- drivers/net/ethernet/qlogic/qlge/qlge.h | 2 +- 11 files changed, 30 insertions(+), 27 deletions(-)