From: Francois Romieu <romieu@fr.zoreil.com>
To: jgarzik@pobox.com
Cc: netdev@oss.sgi.com, akpm@osdl.org
Subject: [PATCH 2.6.9-rc3-mm2 5/5] r8169: cleanup
Date: Mon, 4 Oct 2004 21:53:02 +0200 [thread overview]
Message-ID: <20041004195302.GD20379@electric-eye.fr.zoreil.com> (raw)
In-Reply-To: <20041004195216.GC20379@electric-eye.fr.zoreil.com>
Cleanup
- timeout message is redundant with net/sched/sch_generic::dev_watchdog;
- anti-bloat in rtl8169_get_rx_csum;
- format fix.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jon Mason <jdmason@us.ibm.com>
diff -puN drivers/net/r8169.c~r8169-220 drivers/net/r8169.c
--- linux-2.6.9-rc3/drivers/net/r8169.c~r8169-220 2004-10-04 21:26:36.000000000 +0200
+++ linux-2.6.9-rc3-fr/drivers/net/r8169.c 2004-10-04 21:27:47.000000000 +0200
@@ -660,10 +660,10 @@ static u32 rtl8169_get_rx_csum(struct ne
{
struct rtl8169_private *tp = netdev_priv(dev);
- return !!(tp->cp_cmd & RxChkSum);
+ return tp->cp_cmd & RxChkSum;
}
-static int rtl8169_set_rx_csum(struct net_device *dev, u32 data)
+static int rtl8169_set_rx_csum(struct net_device *dev, u32 data)
{
struct rtl8169_private *tp = netdev_priv(dev);
void *ioaddr = tp->mmio_addr;
@@ -1774,8 +1774,6 @@ static void rtl8169_tx_timeout(struct ne
{
struct rtl8169_private *tp = netdev_priv(dev);
- printk(KERN_INFO "%s: TX Timeout\n", dev->name);
-
rtl8169_hw_reset(tp->mmio_addr);
/* Let's wait a bit while any (async) irq lands on */
@@ -2176,7 +2174,7 @@ rtl8169_interrupt(int irq, void *dev_ins
if (likely(netif_rx_schedule_prep(dev)))
__netif_rx_schedule(dev);
else {
- printk(KERN_INFO "%s: interrupt %x taken in poll\n",
+ printk(KERN_INFO "%s: interrupt %04x taken in poll\n",
dev->name, status);
}
break;
_
next prev parent reply other threads:[~2004-10-04 19:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-04 19:48 [PATCH 2.6.9-rc3-mm2 1/5] r8169: Tx timeout rework Francois Romieu
2004-10-04 19:49 ` [PATCH 2.6.9-rc3-mm2 2/5] r8169: wrong advertisement of VLAN features Francois Romieu
2004-10-04 19:50 ` [PATCH 2.6.9-rc3-mm2 3/5] r8169: automatic pci dac step down Francois Romieu
2004-10-04 19:52 ` [PATCH 2.6.9-rc3-mm2 4/5] r8169: rtl8169_close() races Francois Romieu
2004-10-04 19:53 ` Francois Romieu [this message]
2004-10-04 20:47 ` [PATCH 2.6.9-rc3-mm2 1/5] r8169: Tx timeout rework Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041004195302.GD20379@electric-eye.fr.zoreil.com \
--to=romieu@fr.zoreil.com \
--cc=akpm@osdl.org \
--cc=jgarzik@pobox.com \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).