mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
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>
This commit is contained in:
parent
ae890d511a
commit
ac04b3b73b
1 changed files with 1 additions and 16 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue