| Message ID | 1397784348-16059-1-git-send-email-mcgrof@do-not-panic.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Hi Luis, > From: "Luis R. Rodriguez" <mcgrof@suse.com> > > 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 <bzhao@marvell.com> > Cc: "John W. Linville" <linville@tuxdriver.com> > Cc: linux-wireless@vger.kernel.org > Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> Acked-by: Bing Zhao <bzhao@marvell.com> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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"