From 2a872998f06dbe1b5e6ca98cf6fd643a2ffd2e78 Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
Date: Wed, 1 Jun 2011 06:49:10 +0000
Subject: [PATCH] --- yaml --- r: 253055 b: refs/heads/master c:
 a3bcc23e890a6d49d6763d9eb073d711de2e0469 h: refs/heads/master i:   253053:
 9aac46b46e1ee11a7f5a564552e3ee1809958994   253051:
 d29272a9c4e5a5e793771be97c1df37661b10e53   253047:
 2ceb762861d3b77dcd1724bcc40b43f61481913d   253039:
 2b9ff660d5161b83209819c9f371d6fab0a95019   253023:
 e68c1225d1f968c9b1951831ac3313303c0da3de   252991:
 11454bae63a4bfe56f7e153665346ad34c0a779a   252927:
 107401c059f98d387849dcfdd8e0c0208f04e086 v: v3

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

diff --git a/[refs] b/[refs]
index 0336bca2531a..db7854173a1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41be5a4a3668810bf3687a76c2b017bd437039e0
+refs/heads/master: a3bcc23e890a6d49d6763d9eb073d711de2e0469
diff --git a/trunk/include/linux/if_packet.h b/trunk/include/linux/if_packet.h
index 72bfa5a034dd..6d66ce1791a9 100644
--- a/trunk/include/linux/if_packet.h
+++ b/trunk/include/linux/if_packet.h
@@ -70,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
diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c
index 925f715686a5..ba248d93399a 100644
--- a/trunk/net/packet/af_packet.c
+++ b/trunk/net/packet/af_packet.c
@@ -798,7 +798,12 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
 			getnstimeofday(&ts);
 		h.h2->tp_sec = ts.tv_sec;
 		h.h2->tp_nsec = ts.tv_nsec;
-		h.h2->tp_vlan_tci = vlan_tx_tag_get(skb);
+		if (vlan_tx_tag_present(skb)) {
+			h.h2->tp_vlan_tci = vlan_tx_tag_get(skb);
+			status |= TP_STATUS_VLAN_VALID;
+		} else {
+			h.h2->tp_vlan_tci = 0;
+		}
 		hdrlen = sizeof(*h.h2);
 		break;
 	default:
@@ -1725,8 +1730,12 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,
 		aux.tp_snaplen = skb->len;
 		aux.tp_mac = 0;
 		aux.tp_net = skb_network_offset(skb);
-		aux.tp_vlan_tci = vlan_tx_tag_get(skb);
-
+		if (vlan_tx_tag_present(skb)) {
+			aux.tp_vlan_tci = vlan_tx_tag_get(skb);
+			aux.tp_status |= TP_STATUS_VLAN_VALID;
+		} else {
+			aux.tp_vlan_tci = 0;
+		}
 		put_cmsg(msg, SOL_PACKET, PACKET_AUXDATA, sizeof(aux), &aux);
 	}