lkml.org 
[lkml]   [2014]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] drivers: staging: rtl8192e: Include "asm/unaligned.h" instead of "access_ok.h" in "rtl819x_BAProc.c"
"asm/unaligned.h" is more generic than "access_ok.h", and it may include
"access_ok.h", so need use it instead of "access_ok.h".

During building, "rtllib.h" has already include "asm/unaligned.h", so
will cause building issue. The related error (with allmodconfig under
parisc):

CC [M] drivers/staging/rtl8192e/rtl819x_BAProc.o
In file included from ./arch/parisc/include/asm/unaligned.h:4:0,
from include/linux/ieee80211.h:22,
from include/net/lib80211.h:31,
from drivers/staging/rtl8192e/rtllib.h:45,
from drivers/staging/rtl8192e/rtl819x_BAProc.c:20:
include/linux/unaligned/be_struct.h:6:19: error: redefinition of 'get_unaligned_be16'
static inline u16 get_unaligned_be16(const void *p)
^
In file included from drivers/staging/rtl8192e/rtl819x_BAProc.c:19:0:
include/linux/unaligned/access_ok.h:22:19: note: previous definition of 'get_unaligned_be16' was here
static inline u16 get_unaligned_be16(const void *p)
^
...

For independent from other include files, still suggest it includes
"asm/unaligned.h" too. And also include "asm/byteorder.h" since it is
the first include file".


Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
---
drivers/staging/rtl8192e/rtl819x_BAProc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c
index 66ea791..0415e02 100644
--- a/drivers/staging/rtl8192e/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c
@@ -16,7 +16,8 @@
* Contact Information:
* wlanfae <wlanfae@realtek.com>
******************************************************************************/
-#include <linux/unaligned/access_ok.h>
+#include <asm/byteorder.h>
+#include <asm/unaligned.h>
#include "rtllib.h"
#include "rtl819x_BA.h"

--
1.9.3

\
 
 \ /
  Last update: 2014-12-03 00:01    [W:0.033 / U:0.124 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site