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

[PATCH] Finish annotations of struct vlan_ethhdr

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d02d48d8
...@@ -44,7 +44,7 @@ struct vlan_ethhdr { ...@@ -44,7 +44,7 @@ struct vlan_ethhdr {
unsigned char h_source[ETH_ALEN]; /* source ether addr */ unsigned char h_source[ETH_ALEN]; /* source ether addr */
__be16 h_vlan_proto; /* Should always be 0x8100 */ __be16 h_vlan_proto; /* Should always be 0x8100 */
__be16 h_vlan_TCI; /* Encapsulates priority and VLAN ID */ __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> #include <linux/skbuff.h>
......
...@@ -62,7 +62,7 @@ int vlan_dev_rebuild_header(struct sk_buff *skb) ...@@ -62,7 +62,7 @@ int vlan_dev_rebuild_header(struct sk_buff *skb)
default: default:
printk(VLAN_DBG printk(VLAN_DBG
"%s: unable to resolve type %X addresses.\n", "%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); memcpy(veth->h_source, dev->dev_addr, ETH_ALEN);
break; break;
......
Markdown is supported
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