diff options
Diffstat (limited to 'net/8021q/vlanproc.c')
-rw-r--r-- | net/8021q/vlanproc.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index a8fc0de1f969..1b72c9854d6f 100644 --- a/net/8021q/vlanproc.c +++ b/net/8021q/vlanproc.c | |||
@@ -51,7 +51,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *v); | |||
51 | 51 | ||
52 | 52 | ||
53 | /* | 53 | /* |
54 | * Names of the proc directory entries | 54 | * Names of the proc directory entries |
55 | */ | 55 | */ |
56 | 56 | ||
57 | static const char name_root[] = "vlan"; | 57 | static const char name_root[] = "vlan"; |
@@ -66,7 +66,7 @@ static const char name_conf[] = "config"; | |||
66 | */ | 66 | */ |
67 | 67 | ||
68 | /* | 68 | /* |
69 | * Generic /proc/net/vlan/<file> file and inode operations | 69 | * Generic /proc/net/vlan/<file> file and inode operations |
70 | */ | 70 | */ |
71 | 71 | ||
72 | static struct seq_operations vlan_seq_ops = { | 72 | static struct seq_operations vlan_seq_ops = { |
@@ -111,13 +111,13 @@ static struct file_operations vlandev_fops = { | |||
111 | */ | 111 | */ |
112 | 112 | ||
113 | /* | 113 | /* |
114 | * /proc/net/vlan | 114 | * /proc/net/vlan |
115 | */ | 115 | */ |
116 | 116 | ||
117 | static struct proc_dir_entry *proc_vlan_dir; | 117 | static struct proc_dir_entry *proc_vlan_dir; |
118 | 118 | ||
119 | /* | 119 | /* |
120 | * /proc/net/vlan/config | 120 | * /proc/net/vlan/config |
121 | */ | 121 | */ |
122 | 122 | ||
123 | static struct proc_dir_entry *proc_vlan_conf; | 123 | static struct proc_dir_entry *proc_vlan_conf; |
@@ -238,15 +238,15 @@ int vlan_proc_rem_dev(struct net_device *vlandev) | |||
238 | */ | 238 | */ |
239 | 239 | ||
240 | /* starting at dev, find a VLAN device */ | 240 | /* starting at dev, find a VLAN device */ |
241 | static struct net_device *vlan_skip(struct net_device *dev) | 241 | static struct net_device *vlan_skip(struct net_device *dev) |
242 | { | 242 | { |
243 | while (dev && !(dev->priv_flags & IFF_802_1Q_VLAN)) | 243 | while (dev && !(dev->priv_flags & IFF_802_1Q_VLAN)) |
244 | dev = dev->next; | 244 | dev = dev->next; |
245 | 245 | ||
246 | return dev; | 246 | return dev; |
247 | } | 247 | } |
248 | 248 | ||
249 | /* start read of /proc/net/vlan/config */ | 249 | /* start read of /proc/net/vlan/config */ |
250 | static void *vlan_seq_start(struct seq_file *seq, loff_t *pos) | 250 | static void *vlan_seq_start(struct seq_file *seq, loff_t *pos) |
251 | { | 251 | { |
252 | struct net_device *dev; | 252 | struct net_device *dev; |
@@ -256,19 +256,19 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos) | |||
256 | 256 | ||
257 | if (*pos == 0) | 257 | if (*pos == 0) |
258 | return SEQ_START_TOKEN; | 258 | return SEQ_START_TOKEN; |
259 | 259 | ||
260 | for (dev = vlan_skip(dev_base); dev && i < *pos; | 260 | for (dev = vlan_skip(dev_base); dev && i < *pos; |
261 | dev = vlan_skip(dev->next), ++i); | 261 | dev = vlan_skip(dev->next), ++i); |
262 | 262 | ||
263 | return (i == *pos) ? dev : NULL; | 263 | return (i == *pos) ? dev : NULL; |
264 | } | 264 | } |
265 | 265 | ||
266 | static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos) | 266 | static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos) |
267 | { | 267 | { |
268 | ++*pos; | 268 | ++*pos; |
269 | 269 | ||
270 | return vlan_skip((v == SEQ_START_TOKEN) | 270 | return vlan_skip((v == SEQ_START_TOKEN) |
271 | ? dev_base | 271 | ? dev_base |
272 | : ((struct net_device *)v)->next); | 272 | : ((struct net_device *)v)->next); |
273 | } | 273 | } |
274 | 274 | ||
@@ -287,13 +287,13 @@ static int vlan_seq_show(struct seq_file *seq, void *v) | |||
287 | if (vlan_name_type < ARRAY_SIZE(vlan_name_type_str)) | 287 | if (vlan_name_type < ARRAY_SIZE(vlan_name_type_str)) |
288 | nmtype = vlan_name_type_str[vlan_name_type]; | 288 | nmtype = vlan_name_type_str[vlan_name_type]; |
289 | 289 | ||
290 | seq_printf(seq, "Name-Type: %s\n", | 290 | seq_printf(seq, "Name-Type: %s\n", |
291 | nmtype ? nmtype : "UNKNOWN" ); | 291 | nmtype ? nmtype : "UNKNOWN" ); |
292 | } else { | 292 | } else { |
293 | const struct net_device *vlandev = v; | 293 | const struct net_device *vlandev = v; |
294 | const struct vlan_dev_info *dev_info = VLAN_DEV_INFO(vlandev); | 294 | const struct vlan_dev_info *dev_info = VLAN_DEV_INFO(vlandev); |
295 | 295 | ||
296 | seq_printf(seq, "%-15s| %d | %s\n", vlandev->name, | 296 | seq_printf(seq, "%-15s| %d | %s\n", vlandev->name, |
297 | dev_info->vlan_id, dev_info->real_dev->name); | 297 | dev_info->vlan_id, dev_info->real_dev->name); |
298 | } | 298 | } |
299 | return 0; | 299 | return 0; |
@@ -323,13 +323,13 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset) | |||
323 | seq_puts(seq, "\n"); | 323 | seq_puts(seq, "\n"); |
324 | seq_printf(seq, fmt, "total frames transmitted", stats->tx_packets); | 324 | seq_printf(seq, fmt, "total frames transmitted", stats->tx_packets); |
325 | seq_printf(seq, fmt, "total bytes transmitted", stats->tx_bytes); | 325 | seq_printf(seq, fmt, "total bytes transmitted", stats->tx_bytes); |
326 | seq_printf(seq, fmt, "total headroom inc", | 326 | seq_printf(seq, fmt, "total headroom inc", |
327 | dev_info->cnt_inc_headroom_on_tx); | 327 | dev_info->cnt_inc_headroom_on_tx); |
328 | seq_printf(seq, fmt, "total encap on xmit", | 328 | seq_printf(seq, fmt, "total encap on xmit", |
329 | dev_info->cnt_encap_on_xmit); | 329 | dev_info->cnt_encap_on_xmit); |
330 | seq_printf(seq, "Device: %s", dev_info->real_dev->name); | 330 | seq_printf(seq, "Device: %s", dev_info->real_dev->name); |
331 | /* now show all PRIORITY mappings relating to this VLAN */ | 331 | /* now show all PRIORITY mappings relating to this VLAN */ |
332 | seq_printf(seq, | 332 | seq_printf(seq, |
333 | "\nINGRESS priority mappings: 0:%lu 1:%lu 2:%lu 3:%lu 4:%lu 5:%lu 6:%lu 7:%lu\n", | 333 | "\nINGRESS priority mappings: 0:%lu 1:%lu 2:%lu 3:%lu 4:%lu 5:%lu 6:%lu 7:%lu\n", |
334 | dev_info->ingress_priority_map[0], | 334 | dev_info->ingress_priority_map[0], |
335 | dev_info->ingress_priority_map[1], | 335 | dev_info->ingress_priority_map[1], |