diff options
-rw-r--r-- | include/linux/if_vlan.h | 4 | ||||
-rw-r--r-- | net/8021q/vlanproc.c | 4 |
2 files changed, 4 insertions, 4 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. */ |
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index d216a64421cd..8693b21b3caa 100644 --- a/net/8021q/vlanproc.c +++ b/net/8021q/vlanproc.c | |||
@@ -342,7 +342,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset) | |||
342 | seq_printf(seq, "Device: %s", dev_info->real_dev->name); | 342 | seq_printf(seq, "Device: %s", dev_info->real_dev->name); |
343 | /* now show all PRIORITY mappings relating to this VLAN */ | 343 | /* now show all PRIORITY mappings relating to this VLAN */ |
344 | seq_printf(seq, | 344 | seq_printf(seq, |
345 | "\nINGRESS priority mappings: 0:%lu 1:%lu 2:%lu 3:%lu 4:%lu 5:%lu 6:%lu 7:%lu\n", | 345 | "\nINGRESS priority mappings: 0:%u 1:%u 2:%u 3:%u 4:%u 5:%u 6:%u 7:%u\n", |
346 | dev_info->ingress_priority_map[0], | 346 | dev_info->ingress_priority_map[0], |
347 | dev_info->ingress_priority_map[1], | 347 | dev_info->ingress_priority_map[1], |
348 | dev_info->ingress_priority_map[2], | 348 | dev_info->ingress_priority_map[2], |
@@ -357,7 +357,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset) | |||
357 | const struct vlan_priority_tci_mapping *mp | 357 | const struct vlan_priority_tci_mapping *mp |
358 | = dev_info->egress_priority_map[i]; | 358 | = dev_info->egress_priority_map[i]; |
359 | while (mp) { | 359 | while (mp) { |
360 | seq_printf(seq, "%lu:%hu ", | 360 | seq_printf(seq, "%u:%hu ", |
361 | mp->priority, ((mp->vlan_qos >> 13) & 0x7)); | 361 | mp->priority, ((mp->vlan_qos >> 13) & 0x7)); |
362 | mp = mp->next; | 362 | mp = mp->next; |
363 | } | 363 | } |