diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/8021q/vlan_dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index b6e0eea1e39e..0991e293940f 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -258,7 +258,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, | |||
258 | * won't work for fault tolerant netware but does for the rest. | 258 | * won't work for fault tolerant netware but does for the rest. |
259 | */ | 259 | */ |
260 | if (*(unsigned short *)rawp == 0xFFFF) { | 260 | if (*(unsigned short *)rawp == 0xFFFF) { |
261 | skb->protocol = __constant_htons(ETH_P_802_3); | 261 | skb->protocol = htons(ETH_P_802_3); |
262 | /* place it back on the queue to be handled by true layer 3 protocols. | 262 | /* place it back on the queue to be handled by true layer 3 protocols. |
263 | */ | 263 | */ |
264 | 264 | ||
@@ -281,7 +281,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, | |||
281 | /* | 281 | /* |
282 | * Real 802.2 LLC | 282 | * Real 802.2 LLC |
283 | */ | 283 | */ |
284 | skb->protocol = __constant_htons(ETH_P_802_2); | 284 | skb->protocol = htons(ETH_P_802_2); |
285 | /* place it back on the queue to be handled by upper layer protocols. | 285 | /* place it back on the queue to be handled by upper layer protocols. |
286 | */ | 286 | */ |
287 | 287 | ||
@@ -448,7 +448,7 @@ int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
448 | * OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs... | 448 | * OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs... |
449 | */ | 449 | */ |
450 | 450 | ||
451 | if (veth->h_vlan_proto != __constant_htons(ETH_P_8021Q)) { | 451 | if (veth->h_vlan_proto != htons(ETH_P_8021Q)) { |
452 | int orig_headroom = skb_headroom(skb); | 452 | int orig_headroom = skb_headroom(skb); |
453 | unsigned short veth_TCI; | 453 | unsigned short veth_TCI; |
454 | 454 | ||