projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to wireless-testing 2012-05-29
[openwrt.git]
/
package
/
mac80211
/
patches
/
820-b43-add-antenna-control.patch
diff --git
a/package/mac80211/patches/820-b43-add-antenna-control.patch
b/package/mac80211/patches/820-b43-add-antenna-control.patch
index
82908ab
..
be6b683
100644
(file)
--- a/
package/mac80211/patches/820-b43-add-antenna-control.patch
+++ b/
package/mac80211/patches/820-b43-add-antenna-control.patch
@@
-42,7
+42,7
@@
if (wl->radio_enabled != phy->radio_on) {
if (wl->radio_enabled) {
if (wl->radio_enabled != phy->radio_on) {
if (wl->radio_enabled) {
-@@ -49
34,6 +4931
,47 @@ static int b43_op_get_survey(struct ieee
+@@ -49
40,6 +4937
,47 @@ static int b43_op_get_survey(struct ieee
return 0;
}
return 0;
}
@@
-90,7
+90,7
@@
static const struct ieee80211_ops b43_hw_ops = {
.tx = b43_op_tx,
.conf_tx = b43_op_conf_tx,
static const struct ieee80211_ops b43_hw_ops = {
.tx = b43_op_tx,
.conf_tx = b43_op_conf_tx,
-@@ -49
55,6 +4993
,8 @@ static const struct ieee80211_ops b43_hw
+@@ -49
61,6 +4999
,8 @@ static const struct ieee80211_ops b43_hw
.sw_scan_complete = b43_op_sw_scan_complete_notifier,
.get_survey = b43_op_get_survey,
.rfkill_poll = b43_rfkill_poll,
.sw_scan_complete = b43_op_sw_scan_complete_notifier,
.get_survey = b43_op_get_survey,
.rfkill_poll = b43_rfkill_poll,
@@
-99,7
+99,7
@@
};
/* Hard-reset the chip. Do not call this directly.
};
/* Hard-reset the chip. Do not call this directly.
-@@ -520
1,6 +5241
,8 @@ static int b43_one_core_attach(struct b4
+@@ -520
7,6 +5247
,8 @@ static int b43_one_core_attach(struct b4
if (!wldev)
goto out;
if (!wldev)
goto out;
@@
-108,7
+108,7
@@
wldev->use_pio = b43_modparam_pio;
wldev->dev = dev;
wldev->wl = wl;
wldev->use_pio = b43_modparam_pio;
wldev->dev = dev;
wldev->wl = wl;
-@@ -529
1,6 +5333
,9 @@ static struct b43_wl *b43_wireless_init(
+@@ -529
7,6 +5339
,9 @@ static struct b43_wl *b43_wireless_init(
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;