diff options
| author |   Priit Laes <plaes@plaes.org> | 2012-09-01 12:06:08 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-04 14:31:21 -0700 |
| commit | 59e6201d383a15e152611d245a7bdc1585b8c59c (patch) | |
| tree | 249ddef497229ac8345323e82b487f8852c6ec80 /drivers/staging/csr/unifi_priv.h | |
| parent | staging: csr: unifi_wext.h: Remove KERNEL_VERSION checks (diff) | |
| download | linux-dev-59e6201d383a15e152611d245a7bdc1585b8c59c.tar.xz linux-dev-59e6201d383a15e152611d245a7bdc1585b8c59c.zip | |
staging: csr: unifi_priv.h: Remove KERNEL_VERSION checks
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/unifi_priv.h')
| -rw-r--r-- | drivers/staging/csr/unifi_priv.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/staging/csr/unifi_priv.h b/drivers/staging/csr/unifi_priv.h index 1dee8404a106..f634b315e1c5 100644 --- a/drivers/staging/csr/unifi_priv.h +++ b/drivers/staging/csr/unifi_priv.h @@ -29,9 +29,7 @@ #include <linux/wireless.h> #include <linux/cdev.h> #include <linux/kthread.h> -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) #include <linux/freezer.h> -#endif #ifdef CSR_WIFI_SUPPORT_MMC_DRIVER #include <linux/mmc/core.h> @@ -73,31 +71,9 @@ extern struct wake_lock unifi_sdio_wake_lock; #include "unifi_clients.h" - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) -#include <linux/workqueue.h> - -#undef INIT_WORK -#define INIT_WORK(_work, _func) \ - do { \ - INIT_LIST_HEAD(&(_work)->entry); \ - (_work)->pending = 0; \ - PREPARE_WORK((_work), (_func), (_work)); \ - init_timer(&(_work)->timer); \ - } while(0) - -#endif /* Linux kernel < 2.6.20 */ - - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) #define UF_NETIF_TX_WAKE_ALL_QUEUES(_netdev) netif_tx_wake_all_queues(_netdev) #define UF_NETIF_TX_START_ALL_QUEUES(_netdev) netif_tx_start_all_queues(_netdev) #define UF_NETIF_TX_STOP_ALL_QUEUES(_netdev) netif_tx_stop_all_queues(_netdev) -#else -#define UF_NETIF_TX_WAKE_ALL_QUEUES(_netdev) netif_wake_queue(_netdev) -#define UF_NETIF_TX_START_ALL_QUEUES(_netdev) netif_start_queue(_netdev) -#define UF_NETIF_TX_STOP_ALL_QUEUES(_netdev) netif_stop_queue(_netdev) -#endif /* Linux kernel >= 2.6.27 */ #ifdef CSR_NATIVE_LINUX @@ -1080,9 +1056,6 @@ CsrWifiRouterCtrlStaInfo_t * CsrWifiRouterCtrlGetStationRecordFromHandle(unifi_p void uf_update_sta_activity(unifi_priv_t *priv, u16 interfaceTag, const u8 *peerMacAddress); void uf_process_ma_pkt_cfm_for_ap(unifi_priv_t *priv,u16 interfaceTag, const CSR_MA_PACKET_CONFIRM *pkt_cfm); #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) -int uf_install_qdisc(struct net_device *dev); -#endif void uf_resume_data_plane(unifi_priv_t *priv, int queue, CsrWifiMacAddress peer_address, |