Signed-off-by: Alexey Dobriyan <[EMAIL PROTECTED]>
---
include/linux/if_vlan.h | 2 +-
net/8021q/vlan_dev.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- 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>
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index f2a8750..894efc2 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -62,7 +62,7 @@ int vlan_dev_rebuild_header(struct sk_bu
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;
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
