Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / linux / if_packet.h

diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h
index d4d3c82448f57a95c01babcd5d29f6acb85dcf5c..a630295b255f4e35bdab5486e4288914c40a9aee 100644 (file)
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -59,6 +59,7 @@ struct tpacket_auxdata
        __u32           tp_snaplen;
        __u16           tp_mac;
        __u16           tp_net;
+       __u16           tp_vlan_tci;
 };
 
 struct tpacket_hdr
@@ -90,6 +91,7 @@ struct tpacket2_hdr
        __u16           tp_net;
        __u32           tp_sec;
        __u32           tp_nsec;
+       __u16           tp_vlan_tci;
 };
 
 #define TPACKET2_HDRLEN                (TPACKET_ALIGN(sizeof(struct tpacket2_hdr)) + sizeof(struct sockaddr_ll))