backports: adjust mwifiex uapi patch for new context
authorJohannes Berg <johannes.berg@intel.com>
Tue, 14 Feb 2017 10:01:11 +0000 (11:01 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 14 Feb 2017 10:01:29 +0000 (11:01 +0100)
This showed up in wt-2017-02-12.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
patches/0000-upstream-backport-changes/0005-uapi-compromise/mwifiex.patch

index c5d2a9aa845904aedd9b70258155a6b32a14ad13..b7b2ec2b3cc7d211f0c8ac2489bbd562b0e1f26b 100644 (file)
@@ -6,7 +6,7 @@
  #include <linux/ieee80211.h>
 -#include <uapi/linux/if_arp.h>
 +#include <linux/if_arp.h>
- #include <net/mac80211.h>
+ #include <net/cfg80211.h>
  
  #define MWIFIEX_BSS_COEX_COUNT             2
 --- a/drivers/net/wireless/marvell/mwifiex/sta_rx.c