summaryrefslogtreecommitdiffstats
path: root/net/8021q
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-03-17 22:49:48 -0700
committerDavid S. Miller <davem@davemloft.net>2008-03-17 22:49:48 -0700
commit9534f035ee67630688447e8aac91b1d365a51913 (patch)
tree05af741aea9b709f6aa0227ed8598edcd60b5d73 /net/8021q
parent8e3d716cce0c186ae9c88b91cc5686b78e0fd2d4 (diff)
downloadlinux-stable-9534f035ee67630688447e8aac91b1d365a51913.tar.gz
linux-stable-9534f035ee67630688447e8aac91b1d365a51913.tar.bz2
linux-stable-9534f035ee67630688447e8aac91b1d365a51913.zip
[8021Q]: vlan_dev misannotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-rw-r--r--net/8021q/vlan_dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 77f04e49a1a0..8fbcefe10c9f 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -382,7 +382,7 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
vlan_dev_info(dev)->cnt_encap_on_xmit++;
pr_debug("%s: proto to encap: 0x%hx\n",
- __FUNCTION__, htons(veth->h_vlan_proto));
+ __FUNCTION__, ntohs(veth->h_vlan_proto));
/* Construct the second two bytes. This field looks something
* like:
* usr_priority: 3 bits (high bits)