projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: merge latest changes from trunk, fixes #9227
[openwrt-10.03/.git]
/
package
/
mac80211
/
patches
/
552-mac80211_enable_iftype_wds_aggregation.patch
diff --git
a/package/mac80211/patches/552-mac80211_enable_iftype_wds_aggregation.patch
b/package/mac80211/patches/552-mac80211_enable_iftype_wds_aggregation.patch
index 953ff59f483b6fca4f71db099cb852cb91be32bd..e17194698983970da837249fbaeee8fbbe6a52d8 100644
(file)
--- a/
package/mac80211/patches/552-mac80211_enable_iftype_wds_aggregation.patch
+++ b/
package/mac80211/patches/552-mac80211_enable_iftype_wds_aggregation.patch
@@
-33,7
+33,7
@@
IEEE80211_STYPE_ACTION);
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
IEEE80211_STYPE_ACTION);
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
-@@ -213
2,7 +2132
,8 @@ ieee80211_rx_h_action(struct ieee80211_r
+@@ -213
0,7 +2130
,8 @@ ieee80211_rx_h_action(struct ieee80211_r
*/
if (sdata->vif.type != NL80211_IFTYPE_STATION &&
sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
*/
if (sdata->vif.type != NL80211_IFTYPE_STATION &&
sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
@@
-43,7
+43,7
@@
break;
/* verify action_code is present */
break;
/* verify action_code is present */
-@@ -271
7,13 +2718
,16 @@ static int prepare_for_handlers(struct i
+@@ -271
5,13 +2716
,16 @@ static int prepare_for_handlers(struct i
}
break;
case NL80211_IFTYPE_WDS:
}
break;
case NL80211_IFTYPE_WDS: