diff --git a/[refs] b/[refs] index c9d751fd68f9..542d2cd9ab51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae1511bf769cafeae5ab61aaf9947a16a22cbd10 +refs/heads/master: 4ca2462e94b3b0a2fdd3b777ff2bd9bcd82c6096 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index f902c331217b..ea0b37463860 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -322,6 +322,8 @@ typedef unsigned char *sk_buff_data_t; * @queue_mapping: Queue mapping for multiqueue devices * @ndisc_nodetype: router type (from link layer) * @ooo_okay: allow the mapping of a socket to a queue to be changed + * @l4_rxhash: indicate rxhash is a canonical 4-tuple hash over transport + * ports. * @dma_cookie: a cookie to one of several possible DMA operations * done by skb DMA functions * @secmark: security marking