summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAtzm Watanabe <atzm@stratosphere.co.jp>2013-12-17 22:53:36 +0900
committerDavid S. Miller <davem@davemloft.net>2013-12-18 00:36:16 -0500
commite4d26f4b080f55e9577b45e6b51a04971eb459e9 (patch)
treee7caf4bc1439ce04ac392d94dd71c13aaf90f0e4 /include
parent51846355bc239b7d229ed7a1ea7b0333cbd23f01 (diff)
downloadlinux-e4d26f4b080f55e9577b45e6b51a04971eb459e9.tar.bz2
packet: fill the gap of TPACKET_ALIGNMENT with zeros
struct tpacket{2,3}_hdr is aligned to a multiple of TPACKET_ALIGNMENT. Explicitly defining and zeroing the gap of this makes additional changes easier. Signed-off-by: Atzm Watanabe <atzm@stratosphere.co.jp> Acked-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/if_packet.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h
index 1e24aa701cbd..9185dc9a4485 100644
--- a/include/uapi/linux/if_packet.h
+++ b/include/uapi/linux/if_packet.h
@@ -133,7 +133,7 @@ struct tpacket2_hdr {
__u32 tp_sec;
__u32 tp_nsec;
__u16 tp_vlan_tci;
- __u16 tp_padding;
+ __u8 tp_padding[6];
};
struct tpacket_hdr_variant1 {
@@ -154,6 +154,7 @@ struct tpacket3_hdr {
union {
struct tpacket_hdr_variant1 hv1;
};
+ __u8 tp_padding[12];
};
struct tpacket_bd_ts {