tree 9d3092a44b592a091c4818a20bd678d1191f7a88
parent 98f245e797a01611d6734c7d192240f1361439d3
author Stephen Hemminger <[EMAIL PROTECTED]> Wed, 20 Apr 2005 12:39:42 -0700
committer David S. Miller <[EMAIL PROTECTED]> Wed, 20 Apr 2005 12:39:42 -0700
[NET]: skbuff: remove old NET_CALLER macro
Here is a revised alternative that uses BUG_ON/WARN_ON
(as suggested by Herbert Xu) to eliminate NET_CALLER.
Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
linux/skbuff.h | 6 ------
core/skbuff.c | 12 +++---------
ipv4/route.c | 3 ++-
3 files changed, 5 insertions(+), 16 deletions(-)
Index: include/linux/skbuff.h
===================================================================
--- 1b0c3ca312f7e38c065cfe9915d15efc1750d154/include/linux/skbuff.h
(mode:100644 sha1:9f2d75e4f087642d2af265e0b477d0db53ee56f1)
+++ 9d3092a44b592a091c4818a20bd678d1191f7a88/include/linux/skbuff.h
(mode:100644 sha1:22b701819619cd6403b834284deecdbdcfb553d4)
@@ -83,12 +83,6 @@
* Any questions? No questions, good. --ANK
*/
-#ifdef __i386__
-#define NET_CALLER(arg) (*(((void **)&arg) - 1))
-#else
-#define NET_CALLER(arg) __builtin_return_address(0)
-#endif
-
struct net_device;
#ifdef CONFIG_NETFILTER
Index: net/core/skbuff.c
===================================================================
--- 1b0c3ca312f7e38c065cfe9915d15efc1750d154/net/core/skbuff.c (mode:100644
sha1:c96559574a3fc281d0642846eb1bc49206eabcb4)
+++ 9d3092a44b592a091c4818a20bd678d1191f7a88/net/core/skbuff.c (mode:100644
sha1:1b64817d7de6b8a1fc1173aa2b2ed898c08a6033)
@@ -276,20 +276,14 @@
void __kfree_skb(struct sk_buff *skb)
{
- if (skb->list) {
- printk(KERN_WARNING "Warning: kfree_skb passed an skb still "
- "on a list (from %p).\n", NET_CALLER(skb));
- BUG();
- }
+ BUG_ON(skb->list != NULL);
dst_release(skb->dst);
#ifdef CONFIG_XFRM
secpath_put(skb->sp);
#endif
- if(skb->destructor) {
- if (in_irq())
- printk(KERN_WARNING "Warning: kfree_skb on "
- "hard IRQ %p\n", NET_CALLER(skb));
+ if (skb->destructor) {
+ WARN_ON(in_irq());
skb->destructor(skb);
}
#ifdef CONFIG_NETFILTER
Index: net/ipv4/route.c
===================================================================
--- 1b0c3ca312f7e38c065cfe9915d15efc1750d154/net/ipv4/route.c (mode:100644
sha1:9f91a116d91926df3ba936a80f020a6ab1084d2b)
+++ 9d3092a44b592a091c4818a20bd678d1191f7a88/net/ipv4/route.c (mode:100644
sha1:bb90a0c3a91eb52020d0db0e8b4f94d30e02d596)
@@ -1048,7 +1048,8 @@
return;
}
} else
- printk(KERN_DEBUG "rt_bind_peer(0) @%p\n", NET_CALLER(iph));
+ printk(KERN_DEBUG "rt_bind_peer(0) @%p\n",
+ __builtin_return_address(0));
ip_select_fb_ident(iph);
}
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
