From f67fe3ec52e42d4c17c69c78061013ac8093fd2d Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Wed, 5 Dec 2007 11:57:37 -0800 Subject: [PATCH] --- yaml --- r: 74724 b: refs/heads/master c: abf9b902059fb1d569b64e8645a76f0fccbdbbe5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e100.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e3cf7729297e..8ea7a5638336 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c32bc6e9b0778c891f7f3b97cd05c8cdf98b6721 +refs/heads/master: abf9b902059fb1d569b64e8645a76f0fccbdbbe5 diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c index 3dbaec680b46..e1c8a0d023ea 100644 --- a/trunk/drivers/net/e100.c +++ b/trunk/drivers/net/e100.c @@ -2214,13 +2214,11 @@ static void e100_get_drvinfo(struct net_device *netdev, strcpy(info->bus_info, pci_name(nic->pdev)); } +#define E100_PHY_REGS 0x1C static int e100_get_regs_len(struct net_device *netdev) { struct nic *nic = netdev_priv(netdev); -#define E100_PHY_REGS 0x1C -#define E100_REGS_LEN 1 + E100_PHY_REGS + \ - sizeof(nic->mem->dump_buf) / sizeof(u32) - return E100_REGS_LEN * sizeof(u32); + return 1 + E100_PHY_REGS + sizeof(nic->mem->dump_buf); } static void e100_get_regs(struct net_device *netdev,