diff mbox

mwifiex: don't include mac80211.h

Message ID 20170105123835.20995-1-johannes@sipsolutions.net (mailing list archive)
State Accepted
Commit 50d55b6d3f1c40485e2e06b2805ef81f881ee9db
Delegated to: Kalle Valo
Headers show

Commit Message

Johannes Berg Jan. 5, 2017, 12:38 p.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

This driver doesn't use mac80211, so it shouldn't include mac80211.h,
include only the necessary cfg80211.h instead.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
This depends on the patch moving IEEE80211_NUM_ACS.
---
 drivers/net/wireless/marvell/mwifiex/decl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kalle Valo Jan. 12, 2017, 3:05 p.m. UTC | #1 
Johannes Berg <johannes@sipsolutions.net> wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> This driver doesn't use mac80211, so it shouldn't include mac80211.h,
> include only the necessary cfg80211.h instead.
> 
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Depends on:

3db5e3e707eb wireless: move IEEE80211_NUM_ACS to ieee80211.h

Currently in mac80211-next.

Patch set to Awaiting Upstream.
Kalle Valo Feb. 7, 2017, 7:56 a.m. UTC | #2 
Johannes Berg <johannes@sipsolutions.net> wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> This driver doesn't use mac80211, so it shouldn't include mac80211.h,
> include only the necessary cfg80211.h instead.
> 
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Patch applied to wireless-drivers-next.git, thanks.

50d55b6d3f1c mwifiex: don't include mac80211.h
diff mbox

Patch

diff --git a/drivers/net/wireless/marvell/mwifiex/decl.h b/drivers/net/wireless/marvell/mwifiex/decl.h
index bec300b9c2ea..188e4c370836 100644
--- a/drivers/net/wireless/marvell/mwifiex/decl.h
+++ b/drivers/net/wireless/marvell/mwifiex/decl.h
@@ -27,7 +27,7 @@ 
 #include <linux/timer.h>
 #include <linux/ieee80211.h>
 #include <uapi/linux/if_arp.h>
-#include <net/mac80211.h>
+#include <net/cfg80211.h>
 
 #define MWIFIEX_BSS_COEX_COUNT	     2
 #define MWIFIEX_MAX_BSS_NUM         (3)