aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-05-31 14:49:33 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-06-19 15:49:12 -0400
commitc5ce4874d1f303dc851849d05191d79c3f798acb (patch)
treeb79ae63eb2d3deb113fa1c30e9e73ab636a0b235
parent325ed9ff14d2c726725324280ce3a56d6258b0ea (diff)
b43: drop B43_DEFAULT_CHANNEL
It was never used, b43_switch_channel is always called with hw_value (from mac80211) or whatever get_default_chan returns. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/b43/phy_common.c3
-rw-r--r--drivers/net/wireless/b43/phy_common.h4
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c
index 08244b3b327e..ac4cf2b8aca8 100644
--- a/drivers/net/wireless/b43/phy_common.c
+++ b/drivers/net/wireless/b43/phy_common.c
@@ -408,9 +408,6 @@ int b43_switch_channel(struct b43_wldev *dev, unsigned int new_channel)
408 u16 channelcookie, savedcookie; 408 u16 channelcookie, savedcookie;
409 int err; 409 int err;
410 410
411 if (new_channel == B43_DEFAULT_CHANNEL)
412 new_channel = phy->ops->get_default_chan(dev);
413
414 /* First we set the channel radio code to prevent the 411 /* First we set the channel radio code to prevent the
415 * firmware from sending ghost packets. 412 * firmware from sending ghost packets.
416 */ 413 */
diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/b43/phy_common.h
index 4ad6240d9ff4..9a92df46ae84 100644
--- a/drivers/net/wireless/b43/phy_common.h
+++ b/drivers/net/wireless/b43/phy_common.h
@@ -400,10 +400,6 @@ void b43_phy_take_out_of_reset(struct b43_wldev *dev);
400 * b43_switch_channel - Switch to another channel 400 * b43_switch_channel - Switch to another channel
401 */ 401 */
402int b43_switch_channel(struct b43_wldev *dev, unsigned int new_channel); 402int b43_switch_channel(struct b43_wldev *dev, unsigned int new_channel);
403/**
404 * B43_DEFAULT_CHANNEL - Switch to the default channel.
405 */
406#define B43_DEFAULT_CHANNEL UINT_MAX
407 403
408/** 404/**
409 * b43_software_rfkill - Turn the radio ON or OFF in software. 405 * b43_software_rfkill - Turn the radio ON or OFF in software.