diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-01-21 00:26:25 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:08:32 -0800 |
| commit | 57d3ae847d4403c5e4a35ae5f38665fff1a94c02 (patch) | |
| tree | 2a146a0771c30a8a82b92d66c9963c600d2bf86a /include | |
| parent | 9dfebcc6479c55c001e4bb5fe7cc16b6799c43a7 (diff) | |
| download | kernel_goldelico_gta04-57d3ae847d4403c5e4a35ae5f38665fff1a94c02.zip kernel_goldelico_gta04-57d3ae847d4403c5e4a35ae5f38665fff1a94c02.tar.gz kernel_goldelico_gta04-57d3ae847d4403c5e4a35ae5f38665fff1a94c02.tar.bz2 | |
[VLAN]: Turn __constant_htons into htons where possible
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_vlan.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 82c2352..34f40ef 100644 --- a/include/linux/if_vlan.h +++ b/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; } |