diff options
| author | Marti Bolivar <mbolivarmullen@gmail.com> | 2015-05-01 17:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-08 09:24:16 +0200 |
| commit | ac04b3b73bbcbee48112fb516b1fdd67d0146da5 (patch) | |
| tree | 0f14dc3be1f5bc6c152e9f1a70734b6e449cc8b8 /drivers | |
| parent | ae890d511ad30a1cf01e86fe213123d3dc47b7f3 (diff) | |
staging: rtl8192u: don't redefine container_of()
This file already includes <linux/kernel.h>.
Signed-off-by: Marti Bolivar <mbolivarmullen@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/ieee80211.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h index 702bef6e2f56..23af2aad458e 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h @@ -24,7 +24,7 @@ #ifndef IEEE80211_H #define IEEE80211_H #include <linux/if_ether.h> /* ETH_ALEN */ -#include <linux/kernel.h> /* ARRAY_SIZE */ +#include <linux/kernel.h> #include <linux/module.h> #include <linux/jiffies.h> #include <linux/timer.h> @@ -49,21 +49,6 @@ #define IWEVCUSTOM 0x8c02 #endif - -#ifndef container_of -/** - * container_of - cast a member of a structure out to the containing structure - * - * @ptr: the pointer to the member. - * @type: the type of the container struct this is embedded in. - * @member: the name of the member within the struct. - * - */ -#define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) -#endif - #define KEY_TYPE_NA 0x0 #define KEY_TYPE_WEP40 0x1 #define KEY_TYPE_TKIP 0x2 |