diff options
author | Amerigo Wang <amwang@redhat.com> | 2012-08-09 21:24:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-14 17:33:32 -0400 |
commit | f3da38932b46d1bf171634cc7aae3da405eaf7a6 (patch) | |
tree | 20756347571b685554799102516d6ccaad08d780 /net | |
parent | 77ab8a54d9a8dcc4a46484a04133314f33f2aba6 (diff) |
vlan: clean up some variable names
To be consistent, s/info/vlan/.
Cc: Benjamin LaHaise <bcrl@kvack.org>
Cc: Patrick McHardy <kaber@trash.net>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/8021q/vlan_dev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index b65623f90660..0347d48aa7c9 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -672,8 +672,8 @@ static void vlan_dev_poll_controller(struct net_device *dev) | |||
672 | static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo, | 672 | static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo, |
673 | gfp_t gfp) | 673 | gfp_t gfp) |
674 | { | 674 | { |
675 | struct vlan_dev_priv *info = vlan_dev_priv(dev); | 675 | struct vlan_dev_priv *vlan = vlan_dev_priv(dev); |
676 | struct net_device *real_dev = info->real_dev; | 676 | struct net_device *real_dev = vlan->real_dev; |
677 | struct netpoll *netpoll; | 677 | struct netpoll *netpoll; |
678 | int err = 0; | 678 | int err = 0; |
679 | 679 | ||
@@ -688,7 +688,7 @@ static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *n | |||
688 | goto out; | 688 | goto out; |
689 | } | 689 | } |
690 | 690 | ||
691 | info->netpoll = netpoll; | 691 | vlan->netpoll = netpoll; |
692 | 692 | ||
693 | out: | 693 | out: |
694 | return err; | 694 | return err; |
@@ -696,13 +696,13 @@ out: | |||
696 | 696 | ||
697 | static void vlan_dev_netpoll_cleanup(struct net_device *dev) | 697 | static void vlan_dev_netpoll_cleanup(struct net_device *dev) |
698 | { | 698 | { |
699 | struct vlan_dev_priv *info = vlan_dev_priv(dev); | 699 | struct vlan_dev_priv *vlan= vlan_dev_priv(dev); |
700 | struct netpoll *netpoll = info->netpoll; | 700 | struct netpoll *netpoll = vlan->netpoll; |
701 | 701 | ||
702 | if (!netpoll) | 702 | if (!netpoll) |
703 | return; | 703 | return; |
704 | 704 | ||
705 | info->netpoll = NULL; | 705 | vlan->netpoll = NULL; |
706 | 706 | ||
707 | __netpoll_free_rcu(netpoll); | 707 | __netpoll_free_rcu(netpoll); |
708 | } | 708 | } |