evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8192u: don't redefine container_of()

Browse source 
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:
Marti Bolivar 2015-05-01 17:10:59 -04:00 • committed by Greg Kroah-Hartman
parent ae890d511a
commit ac04b3b73b
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/staging/rtl8192u/ieee80211/ieee80211.h
View file

@ -24,7 +24,7 @@
#ifndef IEEE80211_H #ifndef IEEE80211_H
#define IEEE80211_H #define IEEE80211_H
#include <linux/if_ether.h> /* ETH_ALEN */ #include <linux/if_ether.h> /* ETH_ALEN */
#include <linux/kernel.h> /* ARRAY_SIZE */ #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/timer.h> #include <linux/timer.h>
@ -49,21 +49,6 @@
#define IWEVCUSTOM 0x8c02 #define IWEVCUSTOM 0x8c02
#endif #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_NA 0x0
#define KEY_TYPE_WEP40 0x1 #define KEY_TYPE_WEP40 0x1
#define KEY_TYPE_TKIP 0x2 #define KEY_TYPE_TKIP 0x2