From: Krishna Kumar <krkumar2@in•ibm.com>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, Krishna Kumar <krkumar2@in•ibm.com>
Subject: [PATCH] netdevice: Use existing macros
Date: Sun, 30 Aug 2009 11:51:21 +0530 [thread overview]
Message-ID: <20090830062121.6296.60149.sendpatchset@localhost.localdomain> (raw)
From: Krishna Kumar <krkumar2@in•ibm.com>
netdevice: Consolidate to use existing macros where available.
Patch compiled and 32 simultaneous netperf testing ran fine.
Signed-off-by: Krishna Kumar <krkumar2@in•ibm.com>
---
include/linux/netdevice.h | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff -ruNp org/include/linux/netdevice.h new/include/linux/netdevice.h
--- org/include/linux/netdevice.h 2009-08-29 13:53:51.000000000 +0530
+++ new/include/linux/netdevice.h 2009-08-29 13:54:07.000000000 +0530
@@ -1257,7 +1257,7 @@ static inline void netif_tx_wake_queue(s
{
#ifdef CONFIG_NETPOLL_TRAP
if (netpoll_trap()) {
- clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
+ netif_tx_start_queue(dev_queue);
return;
}
#endif
@@ -1363,7 +1363,8 @@ static inline int netif_running(const st
static inline void netif_start_subqueue(struct net_device *dev, u16 queue_index)
{
struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
- clear_bit(__QUEUE_STATE_XOFF, &txq->state);
+
+ netif_tx_start_queue(txq);
}
/**
@@ -1380,7 +1381,7 @@ static inline void netif_stop_subqueue(s
if (netpoll_trap())
return;
#endif
- set_bit(__QUEUE_STATE_XOFF, &txq->state);
+ netif_tx_stop_queue(txq);
}
/**
@@ -1394,7 +1395,8 @@ static inline int __netif_subqueue_stopp
u16 queue_index)
{
struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
- return test_bit(__QUEUE_STATE_XOFF, &txq->state);
+
+ return netif_tx_queue_stopped(txq);
}
static inline int netif_subqueue_stopped(const struct net_device *dev,
@@ -1746,8 +1748,7 @@ static inline void netif_tx_unlock(struc
* force a schedule.
*/
clear_bit(__QUEUE_STATE_FROZEN, &txq->state);
- if (!test_bit(__QUEUE_STATE_XOFF, &txq->state))
- __netif_schedule(txq->qdisc);
+ netif_schedule_queue(txq);
}
spin_unlock(&dev->tx_global_lock);
}
next reply other threads:[~2009-08-30 6:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-30 6:21 Krishna Kumar [this message]
2009-08-31 5:15 ` [PATCH] netdevice: Use existing macros 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=20090830062121.6296.60149.sendpatchset@localhost.localdomain \
--to=krkumar2@in$(echo .)ibm.com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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