diff options
author | Patrick McHardy <kaber@trash.net> | 2007-06-13 15:07:07 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-11 01:15:00 -0400 |
commit | 734423cf38021966a5d3bd5f5c6aaecaf32fb4ac (patch) | |
tree | 6bf9f1e8998769d9b56e21fbef06bd61ca2a45f5 /include/linux/if_vlan.h | |
parent | 2ae0bf69b716d07126f0a9c17fcc2d76da172cb6 (diff) |
[VLAN]: Use 32 bit value for skb->priority mapping
skb->priority has only 32 bits and even VLAN uses 32 bit values in its API.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_vlan.h')
-rw-r--r-- | include/linux/if_vlan.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 81e9bc93569b..aeddb49193f9 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h | |||
@@ -99,7 +99,7 @@ static inline void vlan_group_set_device(struct vlan_group *vg, int vlan_id, | |||
99 | } | 99 | } |
100 | 100 | ||
101 | struct vlan_priority_tci_mapping { | 101 | struct vlan_priority_tci_mapping { |
102 | unsigned long priority; | 102 | u32 priority; |
103 | unsigned short vlan_qos; /* This should be shifted when first set, so we only do it | 103 | unsigned short vlan_qos; /* This should be shifted when first set, so we only do it |
104 | * at provisioning time. | 104 | * at provisioning time. |
105 | * ((skb->priority << 13) & 0xE000) | 105 | * ((skb->priority << 13) & 0xE000) |
@@ -112,7 +112,7 @@ struct vlan_dev_info { | |||
112 | /** This will be the mapping that correlates skb->priority to | 112 | /** This will be the mapping that correlates skb->priority to |
113 | * 3 bits of VLAN QOS tags... | 113 | * 3 bits of VLAN QOS tags... |
114 | */ | 114 | */ |
115 | unsigned long ingress_priority_map[8]; | 115 | u32 ingress_priority_map[8]; |
116 | struct vlan_priority_tci_mapping *egress_priority_map[16]; /* hash table */ | 116 | struct vlan_priority_tci_mapping *egress_priority_map[16]; /* hash table */ |
117 | 117 | ||
118 | unsigned short vlan_id; /* The VLAN Identifier for this interface. */ | 118 | unsigned short vlan_id; /* The VLAN Identifier for this interface. */ |