linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Priit Laes <plaes@plaes.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Priit Laes <plaes@plaes.org>
Subject: [PATCH 08/14] staging: csr: remove unused define ALLOW_Q_PAUSE
Date: Sat,  1 Sep 2012 12:06:04 +0300	[thread overview]
Message-ID: <1346490370-32438-9-git-send-email-plaes@plaes.org> (raw)
In-Reply-To: <1346490370-32438-1-git-send-email-plaes@plaes.org>


Signed-off-by: Priit Laes <plaes@plaes.org>
---
 drivers/staging/csr/netdev.c     | 11 -----------
 drivers/staging/csr/unifi_priv.h |  8 --------
 2 files changed, 19 deletions(-)

diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c
index 4f6f48c..e304083 100644
--- a/drivers/staging/csr/netdev.c
+++ b/drivers/staging/csr/netdev.c
@@ -56,17 +56,6 @@
 #include <net/pkt_sched.h>
 
 
-/* ALLOW_Q_PAUSE: Pre 2.6.28 kernels do not support multiple driver queues (required for QoS).
- * In order to support QoS in these kernels, multiple queues are implemented in the driver. But since
- * there is only a single queue in the kernel (leading to multiple queues in the driver) there is no possibility
- * of stopping a particular queue in the kernel. Stopping the single kernel queue leads to undesirable starvation
- * of driver queues. One of the proposals is to not stop the kernel queue but to prevent dequeuing from the
- * 'stopped' driver queue. Allow q pause is an experimental implementation of this scheme for pre 2.6.28 kernels.
- * When NOT defined, queues are paused locally in the driver and packets are dequeued for transmission only from the
- * unpaused queues. When Allow q pause is defined the kernel queue is stopped whenever any driver queue is paused.
- */
-#define ALLOW_Q_PAUSE
-
 #ifdef UNIFI_NET_NAME
 #define UF_ALLOC_NETDEV(_dev, _size, _name, _setup, _num_of_queues)     \
     do {                                                                \
diff --git a/drivers/staging/csr/unifi_priv.h b/drivers/staging/csr/unifi_priv.h
index 6d6b461..1dee840 100644
--- a/drivers/staging/csr/unifi_priv.h
+++ b/drivers/staging/csr/unifi_priv.h
@@ -634,12 +634,10 @@ struct unifi_priv {
     spinlock_t wapi_lock;
 #endif
 
-#ifndef ALLOW_Q_PAUSE
     /* Array to indicate if a particular Tx queue is paused, this may not be
      * required in a multiqueue implementation since we can directly stop kernel
      * queues */
     u8 tx_q_paused_flag[UNIFI_TRAFFIC_Q_MAX];
-#endif
 
 #ifdef CSR_WIFI_RX_PATH_SPLIT
     struct workqueue_struct *rx_workqueue;
@@ -798,12 +796,6 @@ typedef struct netInterface_priv
     u8 bcTimSetReqQueued;
 } netInterface_priv_t;
 
-#ifndef ALLOW_Q_PAUSE
-#define net_is_tx_q_paused(priv, q)   (priv->tx_q_paused_flag[q])
-#define net_tx_q_unpause(priv, q)   (priv->tx_q_paused_flag[q] = 0)
-#define net_tx_q_pause(priv, q)   (priv->tx_q_paused_flag[q] = 1)
-#endif
-
 #ifdef CSR_SUPPORT_SME
 #define routerStartBuffering(priv,queue) priv->routerBufferEnable[(queue)] = TRUE;
 #define routerStopBuffering(priv,queue) priv->routerBufferEnable[(queue)]  = FALSE;
-- 
1.7.12


  parent reply	other threads:[~2012-09-01  9:19 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-01  9:05 [PATCH 00/14] staging: csr: Remove kernel version checks Priit Laes
2012-09-01  9:05 ` [PATCH 01/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: <=2.6.25 Priit Laes
2012-09-01  9:05 ` [PATCH 02/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.27 Priit Laes
2012-09-01  9:05 ` [PATCH 03/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.28 Priit Laes
2012-09-01  9:06 ` [PATCH 04/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.29 Priit Laes
2012-09-01  9:06 ` [PATCH 05/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.32 Priit Laes
2012-09-01  9:06 ` [PATCH 06/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.34 Priit Laes
2012-09-01  9:06 ` [PATCH 07/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.37 Priit Laes
2012-09-01  9:06 ` Priit Laes [this message]
2012-09-01  9:06 ` [PATCH 09/14] staging: csr: Drop unused UNIFI_NET_NAME configuration option Priit Laes
2012-09-01  9:06 ` [PATCH 10/14] staging: csr: drv.c: Remove KERNEL_VERSION checks and associated defines Priit Laes
2012-09-01  9:06 ` [PATCH 11/14] staging: csr: unifi_wext.h: Remove KERNEL_VERSION checks Priit Laes
2012-09-01  9:06 ` [PATCH 12/14] staging: csr: unifi_priv.h: " Priit Laes
2012-09-01  9:06 ` [PATCH 13/14] staging: csr: Remove unneeded UF_NETIF_TX_* macros Priit Laes
2012-09-01  9:06 ` [PATCH 14/14] staging: csr: Remove all leftover kernel version checks \o/ Priit Laes

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=1346490370-32438-9-git-send-email-plaes@plaes.org \
    --to=plaes@plaes.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@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).