From: Cong Wang <amwang@redhat.com>
To: netdev@vger.kernel.org
Cc: Cong Wang <amwang@redhat.com>, Benjamin LaHaise <bcrl@kvack.org>,
Patrick McHardy <kaber@trash.net>,
David Miller <davem@davemloft.net>
Subject: [PATCH 11/15] vlan: clean up some variable names
Date: Fri, 10 Aug 2012 19:24:47 +0800 [thread overview]
Message-ID: <1344597891-32242-12-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1344597891-32242-1-git-send-email-amwang@redhat.com>
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>
---
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 b65623f..0347d48 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)
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;
@@ -688,7 +688,7 @@ 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;
@@ -696,13 +696,13 @@ out:
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);
}
--
1.7.7.6
next prev parent reply other threads:[~2012-08-10 11:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-10 11:24 [PATCH v5 00/15] some netpoll and netconsole fixes Cong Wang
2012-08-10 11:24 ` [PATCH 01/15] netpoll: use GFP_ATOMIC in slave_enable_netpoll() and __netpoll_setup() Cong Wang
2012-08-10 11:24 ` [PATCH 02/15] netpoll: make __netpoll_cleanup non-block Cong Wang
2012-08-10 11:24 ` [PATCH 03/15] netconsole: do not release spin_lock when calling __netpoll_cleanup Cong Wang
2012-08-10 11:24 ` [PATCH 04/15] netpoll: take rcu_read_lock_bh() in netpoll_rx() Cong Wang
2012-08-10 11:24 ` [PATCH 05/15] netpoll: use netpoll_rx_on() " Cong Wang
2012-08-10 11:24 ` [PATCH 06/15] netpoll: take rcu_read_lock_bh() in netpoll_send_skb_on_dev() Cong Wang
2012-08-10 11:24 ` [PATCH 07/15] bridge: add some comments for NETDEV_RELEASE Cong Wang
2012-08-10 11:24 ` [PATCH 08/15] bridge: use list_for_each_entry() in netpoll functions Cong Wang
2012-08-10 11:24 ` [PATCH 09/15] netpoll: check netpoll tx status on the right device Cong Wang
2012-08-10 11:24 ` [PATCH 10/15] netpoll: convert several functions to bool Cong Wang
2012-08-10 11:24 ` Cong Wang [this message]
2012-08-10 11:24 ` [PATCH 12/15] vlan: clean up vlan_dev_hard_start_xmit() Cong Wang
2012-08-10 11:24 ` [PATCH 13/15] netpoll: handle vlan tags in netpoll tx and rx path Cong Wang
2012-08-10 11:24 ` [PATCH 14/15] netpoll: re-enable irq in poll_napi() Cong Wang
2012-08-24 19:43 ` Andrew Morton
2012-08-25 6:28 ` Cong Wang
2012-08-10 11:24 ` [PATCH 15/15] netconsole.txt: revision of examples for the receiver of kernel messages Cong Wang
2012-08-13 9:45 ` [PATCH v5 00/15] some netpoll and netconsole fixes Cong Wang
2012-08-14 4:01 ` David Miller
2012-08-14 21:41 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1344597891-32242-12-git-send-email-amwang@redhat.com \
--to=amwang@redhat.com \
--cc=bcrl@kvack.org \
--cc=davem@davemloft.net \
--cc=kaber@trash.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).