Browse Source

r8169,sis190: remove unnecessary length check

The ethtool core will lower the requested length to the one returned by
get_regs_len, therefore no additional check is needed in the get_regs
function.

Reported-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Peter Wu <lekensteyn@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Peter Wu 12 years ago
parent
commit
e7fb06a1b4
2 changed files with 0 additions and 6 deletions
  1. 0 3
      drivers/net/ethernet/realtek/r8169.c
  2. 0 3
      drivers/net/ethernet/sis/sis190.c

+ 0 - 3
drivers/net/ethernet/realtek/r8169.c

@@ -1898,9 +1898,6 @@ static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs,
 {
 	struct rtl8169_private *tp = netdev_priv(dev);
 
-	if (regs->len > R8169_REGS_SIZE)
-		regs->len = R8169_REGS_SIZE;
-
 	rtl_lock_work(tp);
 	memcpy_fromio(p, tp->mmio_addr, regs->len);
 	rtl_unlock_work(tp);

+ 0 - 3
drivers/net/ethernet/sis/sis190.c

@@ -1770,9 +1770,6 @@ static void sis190_get_regs(struct net_device *dev, struct ethtool_regs *regs,
 	struct sis190_private *tp = netdev_priv(dev);
 	unsigned long flags;
 
-	if (regs->len > SIS190_REGS_SIZE)
-		regs->len = SIS190_REGS_SIZE;
-
 	spin_lock_irqsave(&tp->lock, flags);
 	memcpy_fromio(p, tp->mmio_addr, regs->len);
 	spin_unlock_irqrestore(&tp->lock, flags);