2014-04-18 01:25:54

by Luis Chamberlain

Subject: [PATCH] mwifiex: use generic header for if_arp.h

From: "Luis R. Rodriguez" <[email protected]>

Older kernels require both, but if we instead include
the general header we get both in-kernel and UAPI
stuff. This simplifies the backport.

Cc: Bing Zhao <[email protected]>
Cc: "John W. Linville" <[email protected]>
Cc: [email protected]
Signed-off-by: Luis R. Rodriguez <[email protected]>
---
drivers/net/wireless/mwifiex/decl.h | 2 +-
drivers/net/wireless/mwifiex/sta_rx.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/decl.h b/drivers/net/wireless/mwifiex/decl.h
index e7b3e16..51e0f6d 100644
--- a/drivers/net/wireless/mwifiex/decl.h
+++ b/drivers/net/wireless/mwifiex/decl.h
@@ -26,7 +26,7 @@
#include <linux/wait.h>
#include <linux/timer.h>
#include <linux/ieee80211.h>
-#include <uapi/linux/if_arp.h>
+#include <linux/if_arp.h>
#include <net/mac80211.h>


diff --git a/drivers/net/wireless/mwifiex/sta_rx.c b/drivers/net/wireless/mwifiex/sta_rx.c
index ed26387..ea20fef 100644
--- a/drivers/net/wireless/mwifiex/sta_rx.c
+++ b/drivers/net/wireless/mwifiex/sta_rx.c
@@ -17,7 +17,7 @@
* this warranty disclaimer.
*/

-#include <uapi/linux/ipv6.h>
+#include <linux/ipv6.h>
#include <net/ndisc.h>
#include "decl.h"
#include "ioctl.h"
--
1.9.1

2014-04-18 02:39:15

by Bing Zhao

Subject: RE: [PATCH] mwifiex: use generic header for if_arp.h

Hi Luis,

> From: "Luis R. Rodriguez" <[email protected]>
>
> Older kernels require both, but if we instead include the general header we
> get both in-kernel and UAPI stuff. This simplifies the backport.
>
> Cc: Bing Zhao <[email protected]>
> Cc: "John W. Linville" <[email protected]>
> Cc: [email protected]
> Signed-off-by: Luis R. Rodriguez <[email protected]>

Acked-by: Bing Zhao <[email protected]>

Thanks,
Bing

> ---
> drivers/net/wireless/mwifiex/decl.h | 2 +-
> drivers/net/wireless/mwifiex/sta_rx.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/mwifiex/decl.h
> b/drivers/net/wireless/mwifiex/decl.h
> index e7b3e16..51e0f6d 100644
> --- a/drivers/net/wireless/mwifiex/decl.h
> +++ b/drivers/net/wireless/mwifiex/decl.h
> @@ -26,7 +26,7 @@
> #include <linux/wait.h>
> #include <linux/timer.h>
> #include <linux/ieee80211.h>
> -#include <uapi/linux/if_arp.h>
> +#include <linux/if_arp.h>
> #include <net/mac80211.h>
>
>
> diff --git a/drivers/net/wireless/mwifiex/sta_rx.c
> b/drivers/net/wireless/mwifiex/sta_rx.c
> index ed26387..ea20fef 100644
> --- a/drivers/net/wireless/mwifiex/sta_rx.c
> +++ b/drivers/net/wireless/mwifiex/sta_rx.c
> @@ -17,7 +17,7 @@
> * this warranty disclaimer.
> */
>
> -#include <uapi/linux/ipv6.h>
> +#include <linux/ipv6.h>
> #include <net/ndisc.h>
> #include "decl.h"
> #include "ioctl.h"
> --
> 1.9.1