diff options
author | David S. Miller | 2008-11-27 08:48:40 +0100 |
---|---|---|
committer | David S. Miller | 2008-11-27 08:48:40 +0100 |
commit | 5b9ab2ec04ec1e1e53939768805612ac191d7ba2 (patch) | |
tree | 22d29905c148d2d743b3eccb585fbe60fb91e25a /net/core/skbuff.c | |
parent | cxgb3: Update FW loading path. (diff) | |
parent | netfilter: ctnetlink: fix GFP_KERNEL allocation under spinlock (diff) | |
download | kernel-qcow2-linux-5b9ab2ec04ec1e1e53939768805612ac191d7ba2.tar.gz kernel-qcow2-linux-5b9ab2ec04ec1e1e53939768805612ac191d7ba2.tar.xz kernel-qcow2-linux-5b9ab2ec04ec1e1e53939768805612ac191d7ba2.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/hp-plus.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath9k/recv.c
net/wireless/reg.c
Diffstat (limited to 'net/core/skbuff.c')
-rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index e03d77d4c1c9..b1f628741f4c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -149,7 +149,7 @@ void skb_under_panic(struct sk_buff *skb, int sz, void *here) void skb_truesize_bug(struct sk_buff *skb) { - printk(KERN_ERR "SKB BUG: Invalid truesize (%u) " + WARN(net_ratelimit(), KERN_ERR "SKB BUG: Invalid truesize (%u) " "len=%u, sizeof(sk_buff)=%Zd\n", skb->truesize, skb->len, sizeof(struct sk_buff)); } |