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

Commit 3c3f8f25 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

[8021Q]: Add endian annotations. 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2cf655cd

include/linux/if_vlan.h

+4 −4
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ struct hlist_node; 
struct vlan_ethhdr {

   unsigned char	h_dest[ETH_ALEN];	   /* destination eth addr	*/

   unsigned char	h_source[ETH_ALEN];	   /* source ether addr	*/

   unsigned short       h_vlan_proto;              /* Should always be 0x8100 */

   unsigned short       h_vlan_TCI;                /* Encapsulates priority and VLAN ID */

   __be16               h_vlan_proto;              /* Should always be 0x8100 */

   __be16               h_vlan_TCI;                /* Encapsulates priority and VLAN ID */

   unsigned short	h_vlan_encapsulated_proto; /* packet type ID field (or len) */

};
@@ -55,8 +55,8 @@ static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb) 
}



struct vlan_hdr {

   unsigned short       h_vlan_TCI;                /* Encapsulates priority and VLAN ID */

   unsigned short       h_vlan_encapsulated_proto; /* packet type ID field (or len) */

   __be16               h_vlan_TCI;                /* Encapsulates priority and VLAN ID */

   __be16               h_vlan_encapsulated_proto; /* packet type ID field (or len) */

};



#define VLAN_VID_MASK	0xfff

net/8021q/vlan_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, 
	unsigned short vid;

	struct net_device_stats *stats;

	unsigned short vlan_TCI;

	unsigned short proto;

	__be16 proto;



	/* vlan_TCI = ntohs(get_unaligned(&vhdr->h_vlan_TCI)); */

	vlan_TCI = ntohs(vhdr->h_vlan_TCI);