From d69e2a1def8199572c07cd69d97199d6820231ad Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 21 Jan 2008 00:26:25 -0800 Subject: [PATCH] --- yaml --- r: 79311 b: refs/heads/master c: 57d3ae847d4403c5e4a35ae5f38665fff1a94c02 h: refs/heads/master i: 79309: baeea870af437ab0347773207057db843703594a 79307: e96a98cb47578dbb4c0f9d62485fba51b06fb08a 79303: bd78d8d14a372b6b81a74e9f700f69d8a66808f4 79295: c42b278a82d52e2a8774675ae371ac7a93dbe924 v: v3 --- [refs] | 2 +- trunk/include/linux/if_vlan.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e21452f05bae..d77ca5f4fe5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dfebcc6479c55c001e4bb5fe7cc16b6799c43a7 +refs/heads/master: 57d3ae847d4403c5e4a35ae5f38665fff1a94c02 diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h index 82c23522a46d..34f40efc7607 100644 --- a/trunk/include/linux/if_vlan.h +++ b/trunk/include/linux/if_vlan.h @@ -271,12 +271,12 @@ static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, unsigned short memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN); /* first, the ethernet type */ - veth->h_vlan_proto = __constant_htons(ETH_P_8021Q); + veth->h_vlan_proto = htons(ETH_P_8021Q); /* now, the tag */ veth->h_vlan_TCI = htons(tag); - skb->protocol = __constant_htons(ETH_P_8021Q); + skb->protocol = htons(ETH_P_8021Q); skb->mac_header -= VLAN_HLEN; skb->network_header -= VLAN_HLEN; @@ -331,7 +331,7 @@ static inline int __vlan_get_tag(struct sk_buff *skb, unsigned short *tag) { struct vlan_ethhdr *veth = (struct vlan_ethhdr *)skb->data; - if (veth->h_vlan_proto != __constant_htons(ETH_P_8021Q)) { + if (veth->h_vlan_proto != htons(ETH_P_8021Q)) { return -EINVAL; }