lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] Finish annotations of struct vlan_ethhdr

Browse Source 
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Alexey Dobriyan
2005-12-28 22:27:10 +03:00
committed by Linus Torvalds
parent d02d48d865
commit d136fe7243
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/if_vlan.h
View File

@@ -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>

2
net/8021q/vlan_dev.c
View File

@@ -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;