From ae74ecbede660e4420bdb6c88b8b87c4f962e428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sun, 17 Jul 2011 10:30:32 +0200 Subject: [PATCH] --- yaml --- r: 258489 b: refs/heads/master c: 315a685f26ac220711d82bbf88cca6f55f1d9ca3 h: refs/heads/master i: 258487: 397b5d0d9156af19705bf89d48885500c41b7af8 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/phy_ht.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c7ae4a7f485c..65d43a7a7bfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36677874100edb610b22720f90859ee0f41330e2 +refs/heads/master: 315a685f26ac220711d82bbf88cca6f55f1d9ca3 diff --git a/trunk/drivers/net/wireless/b43/phy_ht.c b/trunk/drivers/net/wireless/b43/phy_ht.c index 29821036badf..87cc82932224 100644 --- a/trunk/drivers/net/wireless/b43/phy_ht.c +++ b/trunk/drivers/net/wireless/b43/phy_ht.c @@ -288,6 +288,8 @@ static void b43_phy_ht_op_software_rfkill(struct b43_wldev *dev, b43_radio_2059_init(dev); else B43_WARN_ON(1); + + b43_switch_channel(dev, dev->phy.channel); } } @@ -329,7 +331,7 @@ static int b43_phy_ht_op_switch_channel(struct b43_wldev *dev, static unsigned int b43_phy_ht_op_get_default_chan(struct b43_wldev *dev) { if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) - return 1; + return 11; return 36; }