From fb04f766e3f9b7d203f95bb4d631beadef77eaf8 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 6 Jun 2011 22:42:06 -0700
Subject: [PATCH] --- yaml --- r: 253403 b: refs/heads/master c:
 13fcb7bd322164c67926ffe272846d4860196dc6 h: refs/heads/master i:   253401:
 542dcd60ea300238d7bf15bcd5a415d7ea3ec711   253399:
 1672cd1ea151f025c922212592be5ad26be84e66 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/if_packet.h | 2 ++
 trunk/net/packet/af_packet.c    | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2bbd15636c64..d3a3005ce828 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79b3891587741dfac72cdfead1f2764b56a567b0
+refs/heads/master: 13fcb7bd322164c67926ffe272846d4860196dc6
diff --git a/trunk/include/linux/if_packet.h b/trunk/include/linux/if_packet.h
index 6d66ce1791a9..7b318630139f 100644
--- a/trunk/include/linux/if_packet.h
+++ b/trunk/include/linux/if_packet.h
@@ -62,6 +62,7 @@ struct tpacket_auxdata {
 	__u16		tp_mac;
 	__u16		tp_net;
 	__u16		tp_vlan_tci;
+	__u16		tp_padding;
 };
 
 /* Rx ring - header status */
@@ -101,6 +102,7 @@ struct tpacket2_hdr {
 	__u32		tp_sec;
 	__u32		tp_nsec;
 	__u16		tp_vlan_tci;
+	__u16		tp_padding;
 };
 
 #define TPACKET2_HDRLEN		(TPACKET_ALIGN(sizeof(struct tpacket2_hdr)) + sizeof(struct sockaddr_ll))
diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c
index ba248d93399a..c0c3cda19712 100644
--- a/trunk/net/packet/af_packet.c
+++ b/trunk/net/packet/af_packet.c
@@ -804,6 +804,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
 		} else {
 			h.h2->tp_vlan_tci = 0;
 		}
+		h.h2->tp_padding = 0;
 		hdrlen = sizeof(*h.h2);
 		break;
 	default:
@@ -1736,6 +1737,7 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,
 		} else {
 			aux.tp_vlan_tci = 0;
 		}
+		aux.tp_padding = 0;
 		put_cmsg(msg, SOL_PACKET, PACKET_AUXDATA, sizeof(aux), &aux);
 	}