aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-06-17 05:23:27 +0000
committerDavid S. Miller <davem@davemloft.net>2009-06-17 18:46:03 -0700
commit19633e129c65e5bb62b1af545c5479afcdb01fc4 (patch)
tree6b749f02863fc1ae1d3ec9953e2fe60d1db2064a
parentc564039fd83ea16a86a96d52632794b24849e507 (diff)
downloadlinux-2.6.34-ux500-19633e129c65e5bb62b1af545c5479afcdb01fc4.tar.gz
skbuff: skb_mac_header_was_set is always true on >32 bit
Looking at the crash in log_martians(), one suspect is that the check for mac header being set is not correct. The value of mac_header defaults to 0 on allocation, therefore skb_mac_header_was_set will always be true on platforms using NET_SKBUFF_USES_OFFSET. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/skbuff.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 1a94a303737..436695d8deb 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -201,6 +201,10 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
skb->data = data;
skb_reset_tail_pointer(skb);
skb->end = skb->tail + size;
+#ifdef NET_SKBUFF_DATA_USES_OFFSET
+ skb->mac_header = ~0U;
+#endif
+
/* make sure we initialize shinfo sequentially */
shinfo = skb_shinfo(skb);
atomic_set(&shinfo->dataref, 1);