Skip to content

Commit

Permalink
[VLAN]: Turn __constant_htons into htons where possible
Browse files Browse the repository at this point in the history 
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Jan 28, 2008
1 parent 9dfebcc commit 57d3ae8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions include/linux/if_vlan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 57d3ae8

Please sign in to comment.