X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fhauke.git;a=blobdiff_plain;f=package%2Fkernel%2Fmac80211%2Fpatches%2Fsubsys%2F390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch;h=2bb37fe4f8fa36490f6141740efc2e55eda496b2;hp=ff313ff3b757358c141e48ace8d9dec6b631e0e4;hb=a9e9bdb8ba26ae3cf9df0a230d8eacd92deac821;hpb=ba5b3ce570ea3abb7a05d00fd6d4d4a32804b0e4

diff --git a/package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch b/package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch
index ff313ff3b7..2bb37fe4f8 100644
--- a/package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch
+++ b/package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch
@@ -38,7 +38,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -3719,7 +3719,8 @@ struct cfg80211_ops {
+@@ -3767,7 +3767,8 @@ struct cfg80211_ops {
   *	on wiphy_new(), but can be changed by the driver if it has a good
   *	reason to override the default
   * @WIPHY_FLAG_4ADDR_AP: supports 4addr mode even on AP (with a single station
@@ -50,7 +50,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
   *	control port protocol ethertype. The device also honours the
 --- a/net/mac80211/util.c
 +++ b/net/mac80211/util.c
-@@ -3673,7 +3673,9 @@ int ieee80211_check_combinations(struct
+@@ -3760,7 +3760,9 @@ int ieee80211_check_combinations(struct
  	}
  
  	/* Always allow software iftypes */
@@ -79,7 +79,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  		break;
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -3395,8 +3395,7 @@ static int nl80211_new_interface(struct
+@@ -3387,8 +3387,7 @@ static int nl80211_new_interface(struct
  	if (info->attrs[NL80211_ATTR_IFTYPE])
  		type = nla_get_u32(info->attrs[NL80211_ATTR_IFTYPE]);
  
@@ -89,7 +89,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  		return -EOPNOTSUPP;
  
  	if ((type == NL80211_IFTYPE_P2P_DEVICE || type == NL80211_IFTYPE_NAN ||
-@@ -3415,6 +3414,11 @@ static int nl80211_new_interface(struct
+@@ -3407,6 +3406,11 @@ static int nl80211_new_interface(struct
  			return err;
  	}