Commit f3da3893 authored by Amerigo Wang's avatar Amerigo Wang Committed by David S. Miller

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: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77ab8a54
...@@ -672,8 +672,8 @@ static void vlan_dev_poll_controller(struct net_device *dev) ...@@ -672,8 +672,8 @@ static void vlan_dev_poll_controller(struct net_device *dev)
static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo, static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo,
gfp_t gfp) gfp_t gfp)
{ {
struct vlan_dev_priv *info = vlan_dev_priv(dev); struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
struct net_device *real_dev = info->real_dev; struct net_device *real_dev = vlan->real_dev;
struct netpoll *netpoll; struct netpoll *netpoll;
int err = 0; int err = 0;
...@@ -688,7 +688,7 @@ static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *n ...@@ -688,7 +688,7 @@ static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *n
goto out; goto out;
} }
info->netpoll = netpoll; vlan->netpoll = netpoll;
out: out:
return err; return err;
...@@ -696,13 +696,13 @@ static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *n ...@@ -696,13 +696,13 @@ static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *n
static void vlan_dev_netpoll_cleanup(struct net_device *dev) static void vlan_dev_netpoll_cleanup(struct net_device *dev)
{ {
struct vlan_dev_priv *info = vlan_dev_priv(dev); struct vlan_dev_priv *vlan= vlan_dev_priv(dev);
struct netpoll *netpoll = info->netpoll; struct netpoll *netpoll = vlan->netpoll;
if (!netpoll) if (!netpoll)
return; return;
info->netpoll = NULL; vlan->netpoll = NULL;
__netpoll_free_rcu(netpoll); __netpoll_free_rcu(netpoll);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment