Skip to content

Commit

Permalink
vlan: clean up some variable names
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Amerigo Wang authored and David S. Miller committed Aug 14, 2012
1 parent 77ab8a5 commit f3da389
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions net/8021q/vlan_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
gfp_t gfp)
{
struct vlan_dev_priv *info = vlan_dev_priv(dev);
struct net_device *real_dev = info->real_dev;
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
struct net_device *real_dev = vlan->real_dev;
struct netpoll *netpoll;
int err = 0;

Expand All @@ -688,21 +688,21 @@ static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *n
goto out;
}

info->netpoll = netpoll;
vlan->netpoll = netpoll;

out:
return err;
}

static void vlan_dev_netpoll_cleanup(struct net_device *dev)
{
struct vlan_dev_priv *info = vlan_dev_priv(dev);
struct netpoll *netpoll = info->netpoll;
struct vlan_dev_priv *vlan= vlan_dev_priv(dev);
struct netpoll *netpoll = vlan->netpoll;

if (!netpoll)
return;

info->netpoll = NULL;
vlan->netpoll = NULL;

__netpoll_free_rcu(netpoll);
}
Expand Down

0 comments on commit f3da389

Please sign in to comment.