diff --git a/[refs] b/[refs] index aa1c042dd6d7..76b882883f19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a9204db665365354b349ed5b0bc054f0433a2a4 +refs/heads/master: 4a7b61d23505854dff7d04cc11944566cffdd0ee diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index a640385e0598..cfcc45b3bef0 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/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