aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-20 10:06:09 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-20 10:06:09 -0400
commit902f90735b693550eb51a3989895f3148b8229d8 (patch)
treefaddc60f0b27ed6d2a26f20c2c09f365dc4a2d7d /drivers/net
parent07b8fede6da76ae6a0f547716c44b801a116bb4a (diff)
parent93918e9afc76717176e9e114e79cdbb602a45ae8 (diff)
downloadkernel_samsung_smdk4412-902f90735b693550eb51a3989895f3148b8229d8.zip
kernel_samsung_smdk4412-902f90735b693550eb51a3989895f3148b8229d8.tar.gz
kernel_samsung_smdk4412-902f90735b693550eb51a3989895f3148b8229d8.tar.bz2
Merge branch 'master'
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 5db2bba..d3d4ec9 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -563,8 +563,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;
}