1 files changed, 10 insertions, 9 deletions

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index ae836fded530..03f816a9b659 100644
--- a/include/linux/skbuff.h
+++ b/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,
@@ -354,8 +355,8 @@ struct sk_buff {
                                 ipvs_property:1,
                                 peeked:1,
                                 nf_trace:1;
-        __be16                  protocol:16;
         kmemcheck_bitfield_end(flags1);
+        __be16                  protocol;
 
         void                    (*destructor)(struct sk_buff *skb);
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
@@ -738,7 +739,7 @@ static inline struct sk_buff *skb_unshare(struct sk_buff *skb,
 }
 
 /**
- *      skb_peek
+ *      skb_peek - peek at the head of an &sk_buff_head
  *      @list_: list to peek at
  *
  *      Peek an &sk_buff. Unlike most other operations you _MUST_
@@ -759,7 +760,7 @@ static inline struct sk_buff *skb_peek(struct sk_buff_head *list_)
 }
 
 /**
- *      skb_peek_tail
+ *      skb_peek_tail - peek at the tail of an &sk_buff_head
  *      @list_: list to peek at
  *
  *      Peek an &sk_buff. Unlike most other operations you _MUST_