aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q/vlanproc.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-21 03:26:07 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:08:32 -0500
commit9dfebcc6479c55c001e4bb5fe7cc16b6799c43a7 (patch)
treed933aad54aa6025d0394b48a4a816867c1333e3e /net/8021q/vlanproc.c
parentaf30151709bcace1ca844d4bb8b7e2e392ff81eb (diff)
[VLAN]: Turn VLAN_DEV_INFO into inline function
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlanproc.c')
-rw-r--r--net/8021q/vlanproc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 971e6233801e..b5202443b1a1 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -180,7 +180,7 @@ err:
180 180
181int vlan_proc_add_dev (struct net_device *vlandev) 181int vlan_proc_add_dev (struct net_device *vlandev)
182{ 182{
183 struct vlan_dev_info *dev_info = VLAN_DEV_INFO(vlandev); 183 struct vlan_dev_info *dev_info = vlan_dev_info(vlandev);
184 184
185 dev_info->dent = create_proc_entry(vlandev->name, 185 dev_info->dent = create_proc_entry(vlandev->name,
186 S_IFREG|S_IRUSR|S_IWUSR, 186 S_IFREG|S_IRUSR|S_IWUSR,
@@ -199,9 +199,9 @@ int vlan_proc_add_dev (struct net_device *vlandev)
199int vlan_proc_rem_dev(struct net_device *vlandev) 199int vlan_proc_rem_dev(struct net_device *vlandev)
200{ 200{
201 /** NOTE: This will consume the memory pointed to by dent, it seems. */ 201 /** NOTE: This will consume the memory pointed to by dent, it seems. */
202 if (VLAN_DEV_INFO(vlandev)->dent) { 202 if (vlan_dev_info(vlandev)->dent) {
203 remove_proc_entry(VLAN_DEV_INFO(vlandev)->dent->name, proc_vlan_dir); 203 remove_proc_entry(vlan_dev_info(vlandev)->dent->name, proc_vlan_dir);
204 VLAN_DEV_INFO(vlandev)->dent = NULL; 204 vlan_dev_info(vlandev)->dent = NULL;
205 } 205 }
206 return 0; 206 return 0;
207} 207}
@@ -278,7 +278,7 @@ static int vlan_seq_show(struct seq_file *seq, void *v)
278 nmtype ? nmtype : "UNKNOWN" ); 278 nmtype ? nmtype : "UNKNOWN" );
279 } else { 279 } else {
280 const struct net_device *vlandev = v; 280 const struct net_device *vlandev = v;
281 const struct vlan_dev_info *dev_info = VLAN_DEV_INFO(vlandev); 281 const struct vlan_dev_info *dev_info = vlan_dev_info(vlandev);
282 282
283 seq_printf(seq, "%-15s| %d | %s\n", vlandev->name, 283 seq_printf(seq, "%-15s| %d | %s\n", vlandev->name,
284 dev_info->vlan_id, dev_info->real_dev->name); 284 dev_info->vlan_id, dev_info->real_dev->name);
@@ -289,7 +289,7 @@ static int vlan_seq_show(struct seq_file *seq, void *v)
289static int vlandev_seq_show(struct seq_file *seq, void *offset) 289static int vlandev_seq_show(struct seq_file *seq, void *offset)
290{ 290{
291 struct net_device *vlandev = (struct net_device *) seq->private; 291 struct net_device *vlandev = (struct net_device *) seq->private;
292 const struct vlan_dev_info *dev_info = VLAN_DEV_INFO(vlandev); 292 const struct vlan_dev_info *dev_info = vlan_dev_info(vlandev);
293 struct net_device_stats *stats = &vlandev->stats; 293 struct net_device_stats *stats = &vlandev->stats;
294 static const char fmt[] = "%30s %12lu\n"; 294 static const char fmt[] = "%30s %12lu\n";
295 int i; 295 int i;