diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2005-12-28 22:27:10 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 16:15:34 -0700 |
| commit | d136fe7243081a45a141bb297a7b7a627ab60fa9 (patch) | |
| tree | 23953313f3e648888e4ec49f2430430030cc0213 /include | |
| parent | d02d48d8650bf3e2011f25373dbcf87f3c19f16b (diff) | |
| download | op-kernel-dev-d136fe7243081a45a141bb297a7b7a627ab60fa9.zip op-kernel-dev-d136fe7243081a45a141bb297a7b7a627ab60fa9.tar.gz | |
[PATCH] Finish annotations of struct vlan_ethhdr
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_vlan.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index ab274083..35cb385 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -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> |
