aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-07-15 01:50:39 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-15 01:50:39 -0400
commit393e52e33c6c26ec7db290dab803bac1bed962d4 (patch)
tree54e93a35c98b994556724ad96a90871bfc38b3b4 /net
parentbbd6ef87c544d88c30e4b762b1b61ef267a7d279 (diff)
packet: deliver VLAN TCI to userspace
Store the VLAN tag in the auxillary data/tpacket2_hdr so userspace can properly deal with hardware VLAN tagging/stripping. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/packet/af_packet.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 4f059775d48..db792e02a37 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -702,6 +702,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
702 getnstimeofday(&ts); 702 getnstimeofday(&ts);
703 h.h2->tp_sec = ts.tv_sec; 703 h.h2->tp_sec = ts.tv_sec;
704 h.h2->tp_nsec = ts.tv_nsec; 704 h.h2->tp_nsec = ts.tv_nsec;
705 h.h2->tp_vlan_tci = skb->vlan_tci;
705 hdrlen = sizeof(*h.h2); 706 hdrlen = sizeof(*h.h2);
706 break; 707 break;
707 default: 708 default:
@@ -1172,6 +1173,7 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,
1172 aux.tp_snaplen = skb->len; 1173 aux.tp_snaplen = skb->len;
1173 aux.tp_mac = 0; 1174 aux.tp_mac = 0;
1174 aux.tp_net = skb_network_offset(skb); 1175 aux.tp_net = skb_network_offset(skb);
1176 aux.tp_vlan_tci = skb->vlan_tci;
1175 1177
1176 put_cmsg(msg, SOL_PACKET, PACKET_AUXDATA, sizeof(aux), &aux); 1178 put_cmsg(msg, SOL_PACKET, PACKET_AUXDATA, sizeof(aux), &aux);
1177 } 1179 }