From 8a2150f86831b44b308dcb817a50d0809e5f8863 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 23 Feb 2010 11:45:51 +0000 Subject: [PATCH] --- yaml --- r: 184553 b: refs/heads/master c: da3f5cf1f8ebb0fab5c5fd09adb189166594ad6c h: refs/heads/master i: 184551: 74d667279bfa7cce4abf8f0215c28c3a4a59cff7 v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c828770d800c..980a5fd89928 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d6184e4881b423522136aeb3ec1cbd9c35e8813 +refs/heads/master: da3f5cf1f8ebb0fab5c5fd09adb189166594ad6c diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index ba0f8e3a9cda..d266eeef522d 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -315,22 +315,23 @@ struct sk_buff { struct sk_buff *next; struct sk_buff *prev; - struct sock *sk; ktime_t tstamp; + + struct sock *sk; struct net_device *dev; - unsigned long _skb_dst; -#ifdef CONFIG_XFRM - struct sec_path *sp; -#endif /* * This is the control buffer. It is free to use for every * layer. Please put your private variables there. If you * want to keep them across layers you have to do a skb_clone() * first. This is owned by whoever has the skb queued ATM. */ - char cb[48]; + char cb[48] __aligned(8); + unsigned long _skb_dst; +#ifdef CONFIG_XFRM + struct sec_path *sp; +#endif unsigned int len, data_len; __u16 mac_len,