From: Bartlomiej Zolnierkiewicz Date: Mon, 13 Jul 2009 18:14:08 +0000 (+0200) Subject: Staging: rtl8192su/ieee80211: remove superfluous container_of definition X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=793f96b58571ec09b2a332c52f5218240eddab0c;p=openwrt%2Fstaging%2Fblogic.git Staging: rtl8192su/ieee80211: remove superfluous container_of definition Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192su/TODO b/drivers/staging/rtl8192su/TODO index a1c4bf2c8096..b13be9edb278 100644 --- a/drivers/staging/rtl8192su/TODO +++ b/drivers/staging/rtl8192su/TODO @@ -1,6 +1,5 @@ TODO: - prepare private ieee80211 stack for merge with rtl8187se's version: - - remove superflous container_of definition from ieee80211.h - remove rtl8192su's specific dead code - cleanup ieee80211.h - move rtl8192su's specific code out from ieee80211.h diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211.h b/drivers/staging/rtl8192su/ieee80211/ieee80211.h index 03862d302ce4..75be60dd531a 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211.h @@ -47,20 +47,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