diff --git a/[refs] b/[refs] index b80d4bf71d63..ae8bc4162833 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79f1bc06dbb05f222756d6df4a9ff95588c9cc06 +refs/heads/master: 4b21cd4eedff2123712c2132c8c6264d40332465 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index bb1981fd60f3..eb2e837afaf3 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -168,6 +168,7 @@ struct skb_shared_hwtstamps { * @software: generate software time stamp * @in_progress: device driver is going to provide * hardware time stamp + * @flags: all shared_tx flags * * These flags are attached to packets as part of the * &skb_shared_info. Use skb_tx() to get a pointer.