From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Tue, 13 May 2008 20:33:28 +0000 (+0000)
Subject: Fix for tcpdump
X-Git-Tag: linux-2.6-22-7~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8ef2c4b2eadf737365c92287f0f279c157c1f4c5;p=linux-2.6.git

Fix for tcpdump
---

diff --git a/linux-2.6-520-vnet+.patch b/linux-2.6-520-vnet+.patch
index 01f5529f1..939fb6c45 100644
--- a/linux-2.6-520-vnet+.patch
+++ b/linux-2.6-520-vnet+.patch
@@ -130,7 +130,7 @@ diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
  	skb->data = data;
  	skb_reset_tail_pointer(skb);
  	skb->end = skb->tail + size;
-+	skb->skb_tag = nx_current_nid();
++	if (unlikely(in_softirq())) skb->skb_tag = nx_current_nid();
  	/* make sure we initialize shinfo sequentially */
  	shinfo = skb_shinfo(skb);
  	atomic_set(&shinfo->dataref, 1);
@@ -191,7 +191,7 @@ diff -Nurb linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet
  		}
  		inet->sport = htons(inet->num);
 +		sk->sk_xid = vx_current_xid();
-+		sk->sk_nid = nx_current_nid();
++		if (unlikely(in_softirq())) sk->sk_nid = nx_current_nid();
  	}
  	release_sock(sk);
  	return 0;