Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7fb06a1 authored by Peter Wu's avatar Peter Wu Committed by David S. Miller
Browse files

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: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarPeter Wu <lekensteyn@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d765bb41

drivers/net/ethernet/realtek/r8169.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/sis/sis190.c

+0 −3
Original line number Diff line number Diff line
@@ -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);