Skip to content

Commit

Permalink
staging: csr: remove unused define ALLOW_Q_PAUSE
Browse files Browse the repository at this point in the history
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Priit Laes authored and Greg Kroah-Hartman committed Sep 4, 2012
1 parent 879a901 commit 6e5e404
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 19 deletions.
11 changes: 0 additions & 11 deletions drivers/staging/csr/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,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 { \
Expand Down
8 changes: 0 additions & 8 deletions drivers/staging/csr/unifi_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 6e5e404

Please sign in to comment.