diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-30 04:51:00 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-30 04:51:00 (GMT) |
| commit | e93dc4891df93d7efa59d861fdcbb529a1819343 (patch) | |
| tree | 545d95bc78c76d44b22bf2590c033311f44c0616 /include/linux/skbuff.h | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| parent | 56a6d13dfd49d90d72a1a962246206719dd9d143 (diff) | |
| download | linux-fsl-qoriq-e93dc4891df93d7efa59d861fdcbb529a1819343.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 7ea44f6..a640385 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -316,7 +316,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; |