1 files changed, 8 insertions, 4 deletions

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 7ea44f6621f2..358661c9990e 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -243,6 +243,7 @@ typedef unsigned char *sk_buff_data_t;
  *      @tc_index: Traffic control index
  *      @tc_verd: traffic control verdict
  *      @ndisc_nodetype: router type (from link layer)
+ *      @do_not_encrypt: set to prevent encryption of this frame
  *      @dma_cookie: a cookie to one of several possible DMA operations
  *              done by skb DMA functions
  *      @secmark: security marking
@@ -316,7 +317,10 @@ struct sk_buff {
 #ifdef CONFIG_IPV6_NDISC_NODETYPE
         __u8                    ndisc_nodetype:2;
 #endif
-        /* 14 bit hole */
+#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)
+        __u8                    do_not_encrypt:1;
+#endif
+        /* 0/13/14 bit hole */
 
 #ifdef CONFIG_NET_DMA
         dma_cookie_t            dma_cookie;
@@ -897,7 +901,7 @@ extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta);
 static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len)
 {
         if (len > skb_headlen(skb) &&
-            !__pskb_pull_tail(skb, len-skb_headlen(skb)))
+            !__pskb_pull_tail(skb, len - skb_headlen(skb)))
                 return NULL;
         skb->len -= len;
         return skb->data += len;
@@ -914,7 +918,7 @@ static inline int pskb_may_pull(struct sk_buff *skb, unsigned int len)
                 return 1;
         if (unlikely(len > skb->len))
                 return 0;
-        return __pskb_pull_tail(skb, len-skb_headlen(skb)) != NULL;
+        return __pskb_pull_tail(skb, len - skb_headlen(skb)) != NULL;
 }
 
 /**
@@ -1317,7 +1321,7 @@ static inline int skb_padto(struct sk_buff *skb, unsigned int len)
         unsigned int size = skb->len;
         if (likely(size >= len))
                 return 0;
-        return skb_pad(skb, len-size);
+        return skb_pad(skb, len - size);
 }
 
 static inline int skb_add_data(struct sk_buff *skb,