Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b93b7eeb authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[NET] 8021Q: Use htons() where appropriate. 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2953fd24

net/8021q/vlan_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, 
	 * won't work for fault tolerant netware but does for the rest.

	 */

	if (*(unsigned short *)rawp == 0xFFFF) {

		skb->protocol = __constant_htons(ETH_P_802_3);

		skb->protocol = htons(ETH_P_802_3);

		/* place it back on the queue to be handled by true layer 3 protocols.

		 */
@@ -281,7 +281,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, 
	/*

	 *	Real 802.2 LLC

	 */

	skb->protocol = __constant_htons(ETH_P_802_2);

	skb->protocol = htons(ETH_P_802_2);

	/* place it back on the queue to be handled by upper layer protocols.

	 */
@@ -448,7 +448,7 @@ int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	 * OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs...

	 */



	if (veth->h_vlan_proto != __constant_htons(ETH_P_8021Q)) {

	if (veth->h_vlan_proto != htons(ETH_P_8021Q)) {

		int orig_headroom = skb_headroom(skb);

		unsigned short veth_TCI;