From a2acd2e956c170f94a4f0b5a37cc278f613e6765 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Wed, 28 Dec 2005 22:27:10 +0300 Subject: [PATCH] --- yaml --- r: 39259 b: refs/heads/master c: d136fe7243081a45a141bb297a7b7a627ab60fa9 h: refs/heads/master i: 39257: d4d591fba066d6805919ddff690c0e513b5445f7 39255: 7f168ea6531d3ea0edc2259f77cd1b2ef730d8b0 v: v3 --- [refs] | 2 +- trunk/include/linux/if_vlan.h | 2 +- trunk/net/8021q/vlan_dev.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index beaeeeaae643..91528e4545ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d02d48d8650bf3e2011f25373dbcf87f3c19f16b +refs/heads/master: d136fe7243081a45a141bb297a7b7a627ab60fa9 diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h index ab2740832742..35cb38573583 100644 --- a/trunk/include/linux/if_vlan.h +++ b/trunk/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 diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c index da9cfe927158..60a508eb1945 100644 --- a/trunk/net/8021q/vlan_dev.c +++ b/trunk/net/8021q/vlan_dev.c @@ -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;