Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / include / linux / if_packet.h

diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h
index 6ac23ef1801aaf9945dfdecfe386be51d7d9ac44..6d66ce1791a912c34add6ca9ec04ec875c379f93 100644 (file)
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -48,6 +48,7 @@ struct sockaddr_ll {
 #define PACKET_LOSS                    14
 #define PACKET_VNET_HDR                        15
 #define PACKET_TX_TIMESTAMP            16
+#define PACKET_TIMESTAMP               17
 
 struct tpacket_stats {
        unsigned int    tp_packets;
@@ -69,6 +70,7 @@ struct tpacket_auxdata {
 #define TP_STATUS_COPY         0x2
 #define TP_STATUS_LOSING       0x4
 #define TP_STATUS_CSUMNOTREADY 0x8
+#define TP_STATUS_VLAN_VALID   0x10 /* auxdata has valid tp_vlan_tci */
 
 /* Tx ring - header status */
 #define TP_STATUS_AVAILABLE    0x0