[PATCH] Finish annotations of struct vlan_ethhdr
authorAlexey Dobriyan <adobriyan@gmail.com>
Wed, 28 Dec 2005 19:27:10 +0000 (22:27 +0300)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Oct 2006 23:15:34 +0000 (16:15 -0700)
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>
include/linux/if_vlan.h
net/8021q/vlan_dev.c

index ab2740832742e85c6a6870384aa47bbe70c8a201..35cb385735837a2e5b0eca166770bcc647c41fd9 100644 (file)
@@ -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>
index da9cfe92715815d5c754eb268c2fd8f84e1467a8..60a508eb1945bd78c05b3a3424a93cb30af7b20f 100644 (file)
@@ -62,7 +62,7 @@ int vlan_dev_rebuild_header(struct sk_buff *skb)
        default:
                printk(VLAN_DBG
                       "%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);
                break;