Skip to contentSkip to conversation

Finish annotations of struct vlan_ethhdr

PATCH In review Al Viro 2 participants 2 messages Oct 10, 2006

Subsystems (2)
lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 13/16 Finish annotations of struct vlan_ethhdr

From: Alexey Dobriyan <[email protected]>
Date: Wed, 28 Dec 2005 22:27:10 +0300

---
 include/linux/if_vlan.h |    2 +-
 net/8021q/vlan_dev.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/if_vlan.h +1 -1
index ab27408..35cb385 100644
@@ -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>
net/8021q/vlan_dev.c +1 -1
index da9cfe9..60a508e 100644
@@ -62,7 +62,7 @@ #endif	
 	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;
Signature · 1 line
1.4.2.GIT