diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-16 02:27:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-16 02:27:12 -0700 |
| commit | a1870b9cc280fe16fed13994810f8a1687be3bcf (patch) | |
| tree | d482018f5cc8ff0412c0c4d02f984960a5ec2385 /net/mac80211/util.c | |
| parent | 6cc90a5a6061428358d0f726a53fb44af5254111 (diff) | |
| parent | 1fa6f4af9f55bc1b753af04276984429d6b5a613 (diff) | |
| download | op-kernel-dev-a1870b9cc280fe16fed13994810f8a1687be3bcf.zip op-kernel-dev-a1870b9cc280fe16fed13994810f8a1687be3bcf.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 66ce96a..915e777 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -774,31 +774,6 @@ void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, dev_queue_xmit(skb); } -int ieee80211_set_freq(struct ieee80211_sub_if_data *sdata, int freqMHz) -{ - int ret = -EINVAL; - struct ieee80211_channel *chan; - struct ieee80211_local *local = sdata->local; - - chan = ieee80211_get_channel(local->hw.wiphy, freqMHz); - - if (chan && !(chan->flags & IEEE80211_CHAN_DISABLED)) { - if (sdata->vif.type == NL80211_IFTYPE_ADHOC && - chan->flags & IEEE80211_CHAN_NO_IBSS) - return ret; - local->oper_channel = chan; - local->oper_channel_type = NL80211_CHAN_NO_HT; - - if (local->sw_scanning || local->hw_scanning) - ret = 0; - else - ret = ieee80211_hw_config( - local, IEEE80211_CONF_CHANGE_CHANNEL); - } - - return ret; -} - u32 ieee80211_mandatory_rates(struct ieee80211_local *local, enum ieee80211_band band) { |
