Commit d136fe72 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] Finish annotations of struct vlan_ethhdr

Signed-off-by: default avatarAlexey Dobriyan <>
Signed-off-by: default avatarAl Viro <>
Acked-by: default avatarDavid S. Miller <>
Signed-off-by: default avatarLinus Torvalds <>
parent d02d48d8
......@@ -44,7 +44,7 @@ struct vlan_ethhdr {
unsigned char h_source[ETH_ALEN]; /* source ether addr */
__be16 h_vlan_proto; /* Should always be 0x8100 */
__be16 h_vlan_TCI; /* Encapsulates priority and VLAN ID */
unsigned short h_vlan_encapsulated_proto; /* packet type ID field (or len) */
__be16 h_vlan_encapsulated_proto; /* packet type ID field (or len) */
#include <linux/skbuff.h>
......@@ -62,7 +62,7 @@ int vlan_dev_rebuild_header(struct sk_buff *skb)
"%s: unable to resolve type %X addresses.\n",
dev->name, (int)veth->h_vlan_encapsulated_proto);
dev->name, ntohs(veth->h_vlan_encapsulated_proto));
memcpy(veth->h_source, dev->dev_addr, ETH_ALEN);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment