nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

packet: deliver VLAN TCI to userspace

Browse source 
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>
This commit is contained in:
Patrick McHardy 2008-07-14 22:50:39 -07:00 committed by David S. Miller
parent bbd6ef87c5
commit 393e52e33c
2 changed files with 4 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/if_packet.h
View file

@ -59,6 +59,7 @@ struct tpacket_auxdata
__u32 tp_snaplen; __u32 tp_snaplen;
__u16 tp_mac; __u16 tp_mac;
__u16 tp_net; __u16 tp_net;
__u16 tp_vlan_tci;
}; };
struct tpacket_hdr struct tpacket_hdr
@ -90,6 +91,7 @@ struct tpacket2_hdr
__u16 tp_net; __u16 tp_net;
__u32 tp_sec; __u32 tp_sec;
__u32 tp_nsec; __u32 tp_nsec;
__u16 tp_vlan_tci;
}; };
#define TPACKET2_HDRLEN (TPACKET_ALIGN(sizeof(struct tpacket2_hdr)) + sizeof(struct sockaddr_ll)) #define TPACKET2_HDRLEN (TPACKET_ALIGN(sizeof(struct tpacket2_hdr)) + sizeof(struct sockaddr_ll))

2
net/packet/af_packet.c
View file

@ -702,6 +702,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
getnstimeofday(&ts); getnstimeofday(&ts);
h.h2->tp_sec = ts.tv_sec; h.h2->tp_sec = ts.tv_sec;
h.h2->tp_nsec = ts.tv_nsec; h.h2->tp_nsec = ts.tv_nsec;
h.h2->tp_vlan_tci = skb->vlan_tci;
hdrlen = sizeof(*h.h2); hdrlen = sizeof(*h.h2);
break; break;
default: default:
@ -1172,6 +1173,7 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,
aux.tp_snaplen = skb->len; aux.tp_snaplen = skb->len;
aux.tp_mac = 0; aux.tp_mac = 0;
aux.tp_net = skb_network_offset(skb); aux.tp_net = skb_network_offset(skb);
aux.tp_vlan_tci = skb->vlan_tci;
put_cmsg(msg, SOL_PACKET, PACKET_AUXDATA, sizeof(aux), &aux); put_cmsg(msg, SOL_PACKET, PACKET_AUXDATA, sizeof(aux), &aux);
} }