summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-21 21:33:27 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-21 21:33:27 -0400
commite78a57de94480226f7fc90d0b4837bfc6c99a9e0 (patch)
treebfe0a664f88b6cb9d284869d615ae2d7fdb7cf63 /drivers/net
parent77501f3cb648e18733509a951ed31eddd7ef2c0b (diff)
parent452503f993feffe96e8cc9fbff4888b96e2c5e40 (diff)
downloadblackbird-op-linux-e78a57de94480226f7fc90d0b4837bfc6c99a9e0.tar.gz
blackbird-op-linux-e78a57de94480226f7fc90d0b4837bfc6c99a9e0.zip
Merge branch 'upstream'
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/orinoco.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index cf3daaa1b369..15ceaf615756 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -578,8 +578,9 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
txfid, NULL);
if (err) {
netif_start_queue(dev);
- printk(KERN_ERR "%s: Error %d transmitting packet\n",
- dev->name, err);
+ if (net_ratelimit())
+ printk(KERN_ERR "%s: Error %d transmitting packet\n",
+ dev->name, err);
stats->tx_errors++;
goto fail;
}
OpenPOWER on IntegriCloud