From: Cong Wang <amwang@redhat.com>
To: netdev@vger.kernel.org
Cc: Cong Wang <amwang@redhat.com>, David Miller <davem@davemloft.net>,
Jiri Pirko <jiri@resnulli.us>
Subject: [PATCH 09/15] netpoll: check netpoll tx status on the right device
Date: Fri, 10 Aug 2012 19:24:45 +0800 [thread overview]
Message-ID: <1344597891-32242-10-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1344597891-32242-1-git-send-email-amwang@redhat.com>
Although this doesn't matter actually, because netpoll_tx_running()
doesn't use the parameter, the code will be more readable.
For team_dev_queue_xmit() we have to move it down to avoid
compile errors.
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
drivers/net/bonding/bond_main.c | 2 +-
include/linux/if_team.h | 30 +++++++++++++++---------------
net/bridge/br_forward.c | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index e428916..d688a8a 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -398,7 +398,7 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
sizeof(qdisc_skb_cb(skb)->slave_dev_queue_mapping));
skb->queue_mapping = qdisc_skb_cb(skb)->slave_dev_queue_mapping;
- if (unlikely(netpoll_tx_running(slave_dev)))
+ if (unlikely(netpoll_tx_running(bond->dev)))
bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);
else
dev_queue_xmit(skb);
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 6960fc1..aa2e167 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -96,21 +96,6 @@ static inline void team_netpoll_send_skb(struct team_port *port,
}
#endif
-static inline int team_dev_queue_xmit(struct team *team, struct team_port *port,
- struct sk_buff *skb)
-{
- BUILD_BUG_ON(sizeof(skb->queue_mapping) !=
- sizeof(qdisc_skb_cb(skb)->slave_dev_queue_mapping));
- skb_set_queue_mapping(skb, qdisc_skb_cb(skb)->slave_dev_queue_mapping);
-
- skb->dev = port->dev;
- if (unlikely(netpoll_tx_running(port->dev))) {
- team_netpoll_send_skb(port, skb);
- return 0;
- }
- return dev_queue_xmit(skb);
-}
-
struct team_mode_ops {
int (*init)(struct team *team);
void (*exit)(struct team *team);
@@ -200,6 +185,21 @@ struct team {
long mode_priv[TEAM_MODE_PRIV_LONGS];
};
+static inline int team_dev_queue_xmit(struct team *team, struct team_port *port,
+ struct sk_buff *skb)
+{
+ BUILD_BUG_ON(sizeof(skb->queue_mapping) !=
+ sizeof(qdisc_skb_cb(skb)->slave_dev_queue_mapping));
+ skb_set_queue_mapping(skb, qdisc_skb_cb(skb)->slave_dev_queue_mapping);
+
+ skb->dev = port->dev;
+ if (unlikely(netpoll_tx_running(team->dev))) {
+ team_netpoll_send_skb(port, skb);
+ return 0;
+ }
+ return dev_queue_xmit(skb);
+}
+
static inline struct hlist_head *team_port_index_hash(struct team *team,
int port_index)
{
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index e9466d4..02015a5 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -65,7 +65,7 @@ static void __br_deliver(const struct net_bridge_port *to, struct sk_buff *skb)
{
skb->dev = to->dev;
- if (unlikely(netpoll_tx_running(to->dev))) {
+ if (unlikely(netpoll_tx_running(to->br->dev))) {
if (packet_length(skb) > skb->dev->mtu && !skb_is_gso(skb))
kfree_skb(skb);
else {
--
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 ` Cong Wang [this message]
2012-08-10 11:24 ` [PATCH 10/15] netpoll: convert several functions to bool Cong Wang
2012-08-10 11:24 ` [PATCH 11/15] vlan: clean up some variable names Cong Wang
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-10-git-send-email-amwang@redhat.com \
--to=amwang@redhat.com \
--cc=davem@davemloft.net \
--cc=jiri@resnulli.us \
--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).