Commit 71854255 authored by Eran Ben Elisha's avatar Eran Ben Elisha Committed by Jakub Kicinski
Browse files

net: vlan: Add parse protocol header ops 



Add parse protocol header ops for vlan device. Before this patch, vlan
tagged packet transmitted by af_packet had skb->protocol unset. Some
kernel methods (like __skb_flow_dissect()) rely on this missing information
for its packet processing.

Signed-off-by: default avatarEran Ben Elisha <eranbe@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e3a76707

net/8021q/vlan_dev.c

+9 −0
Original line number Diff line number Diff line
@@ -510,9 +510,17 @@ static void vlan_dev_set_lockdep_class(struct net_device *dev) 
	netdev_for_each_tx_queue(dev, vlan_dev_set_lockdep_one, NULL);

}



static __be16 vlan_parse_protocol(const struct sk_buff *skb)

{

	struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data);



	return __vlan_get_protocol(skb, veth->h_vlan_proto, NULL);

}



static const struct header_ops vlan_header_ops = {

	.create	 = vlan_dev_hard_header,

	.parse	 = eth_header_parse,

	.parse_protocol = vlan_parse_protocol,

};



static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev,
@@ -532,6 +540,7 @@ static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev 
static const struct header_ops vlan_passthru_header_ops = {

	.create	 = vlan_passthru_hard_header,

	.parse	 = eth_header_parse,

	.parse_protocol = vlan_parse_protocol,

};



static struct device_type vlan_type = {