summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-15 03:34:57 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-17 19:21:12 -0700
commit51cb6db0f5654f08a4a6bfa3888dc36a51c2df3e (patch)
treeb9103a34674efeca9ffa2f9ef9cec1ee9735ab9d /net/mac80211/ieee80211_i.h
parenteae792b722fef08dcf3aee88266ee7def9710757 (diff)
downloadop-kernel-dev-51cb6db0f5654f08a4a6bfa3888dc36a51c2df3e.zip
op-kernel-dev-51cb6db0f5654f08a4a6bfa3888dc36a51c2df3e.tar.gz
mac80211: Reimplement WME using ->select_queue().
The only behavior change is that we do not drop packets under any circumstances. If that is absolutely needed, we could easily add it back. With cleanups and help from Johannes Berg. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index cbea015..a4f9a83 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -25,6 +25,7 @@
#include <linux/etherdevice.h>
#include <net/wireless.h>
#include <net/iw_handler.h>
+#include <net/mac80211.h>
#include "key.h"
#include "sta_info.h"
@@ -537,6 +538,9 @@ enum {
IEEE80211_ADDBA_MSG = 4,
};
+/* maximum number of hardware queues we support. */
+#define QD_MAX_QUEUES (IEEE80211_MAX_AMPDU_QUEUES + IEEE80211_MAX_QUEUES)
+
struct ieee80211_local {
/* embed the driver visible part.
* don't cast (use the static inlines below), but we keep
@@ -545,6 +549,8 @@ struct ieee80211_local {
const struct ieee80211_ops *ops;
+ unsigned long queue_pool[BITS_TO_LONGS(QD_MAX_QUEUES)];
+
struct net_device *mdev; /* wmaster# - "master" 802.11 device */
int open_count;
int monitors, cooked_mntrs;
@@ -740,15 +746,6 @@ struct ieee80211_local {
#endif
};
-static inline int ieee80211_is_multiqueue(struct ieee80211_local *local)
-{
-#ifdef CONFIG_MAC80211_QOS
- return netif_is_multiqueue(local->mdev);
-#else
- return 0;
-#endif
-}
-
static inline struct ieee80211_sub_if_data *
IEEE80211_DEV_TO_SUB_IF(struct net_device *dev)
{
OpenPOWER on IntegriCloud