Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c2b3328 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[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: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 98f245e7

include/linux/skbuff.h

+0 −6
Original line number Diff line number Diff line
@@ -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

net/core/skbuff.c

+3 −9
Original line number Diff line number Diff line
@@ -276,20 +276,14 @@ void kfree_skbmem(struct sk_buff *skb) 


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));

		WARN_ON(in_irq());

		skb->destructor(skb);

	}

#ifdef CONFIG_NETFILTER

net/ipv4/route.c

+2 −1
Original line number Diff line number Diff line
@@ -1048,7 +1048,8 @@ void __ip_select_ident(struct iphdr *iph, struct dst_entry *dst, int more) 
			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);

}