diff options
Diffstat (limited to 'drivers/net/wireless/bcmdhd/include/linuxver.h')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/include/linuxver.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/net/wireless/bcmdhd/include/linuxver.h b/drivers/net/wireless/bcmdhd/include/linuxver.h index d269e66f7fb..b4f21200875 100644 --- a/drivers/net/wireless/bcmdhd/include/linuxver.h +++ b/drivers/net/wireless/bcmdhd/include/linuxver.h @@ -2,9 +2,9 @@ * Linux-specific abstractions to gain some independence from linux kernel versions. * Pave over some 2.2 versus 2.4 versus 2.6 kernel differences. * - * Copyright (C) 1999-2011, Broadcom Corporation + * Copyright (C) 1999-2012, Broadcom Corporation * - * Unless you and Broadcom execute a separate written software license + * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), * available at http://www.broadcom.com/licenses/GPLv2.php, with the @@ -22,10 +22,9 @@ * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. * - * $Id: linuxver.h 280266 2011-08-28 04:18:20Z $ + * $Id: linuxver.h 309909 2012-01-21 00:15:02Z $ */ - #ifndef _linuxver_h_ #define _linuxver_h_ @@ -72,6 +71,8 @@ #include <linux/netdevice.h> #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) #include <linux/semaphore.h> +#else +#include <asm/semaphore.h> #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) #undef IP_TOS @@ -217,10 +218,10 @@ extern void pci_unregister_driver(struct pci_driver *drv); #undef WL_USE_NETDEV_OPS #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)) && defined(CONFIG_RFKILL_INPUT) -#define WL_CONFIG_RFKILL_INPUT +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) && defined(CONFIG_RFKILL) +#define WL_CONFIG_RFKILL #else -#undef WL_CONFIG_RFKILL_INPUT +#undef WL_CONFIG_RFKILL #endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 48)) @@ -469,7 +470,7 @@ typedef struct { long thr_pid; int prio; struct semaphore sema; - bool terminated; + int terminated; struct completion completed; } tsk_ctl_t; @@ -524,6 +525,11 @@ typedef struct { } while (0); #endif /* LINUX_VERSION_CODE */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)) +#define BLOCKABLE() (!in_atomic()) +#else +#define BLOCKABLE() (!in_interrupt()) +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) #define KILL_PROC(nr, sig) \ |