diff --git a/[refs] b/[refs] index 894409a5255e..15aae26c22f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 047f7617eba3653ff3bcfbe902986903fff2ed3b +refs/heads/master: f7d0e5a506396419eb731b6c6cd97ed23c9245c7 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index 11fd9f2c4093..299ec4b31412 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -242,6 +242,7 @@ typedef unsigned char *sk_buff_data_t; * @queue_mapping: Queue mapping for multiqueue devices * @tc_index: Traffic control index * @tc_verd: traffic control verdict + * @ndisc_nodetype: router type (from link layer) * @dma_cookie: a cookie to one of several possible DMA operations * done by skb DMA functions * @secmark: security marking