diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-22 16:07:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-22 16:07:23 -0400 |
| commit | c3719a1ef52eb1aadf77b7557cc9ca08124d8818 (patch) | |
| tree | 9fc3737751948a71cde8f8ff64d1ca4cb0f44932 /net/wireless/core.h | |
| parent | 35c579070a349cfe54f9e09a47df2c5b68d58469 (diff) | |
| parent | a0d0d1685f9763ab26a394df3ab84026b39a06a7 (diff) | |
| download | linux-c3719a1ef52eb1aadf77b7557cc9ca08124d8818.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John says:
--------------------
I apologize for not having sent this sooner. FWIW, I was in a car
somewhere between Illinois and North Carolina for most of the day
Sunday and Monday... :-)
This is (obviously) the last non-fix pull request for wireless bits
intended for 3.5. It includes AP support for mwifiex, a variety of HCI
and other updates for NFC, some brcmfmac and brcmsmac refactoring,
a large batch of ssb and bcma updates, a batch of ath6kl updates,
some cfg80211 and mac80211 updates/refactoring from Johannes Berg,
a rather large collection of Bluetooth updates by way of Gustavo,
and a variety of other bits here and there.
--------------------
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/core.h')
| -rw-r--r-- | net/wireless/core.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index 3ac2dd00d714..8523f3878677 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -445,8 +445,6 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev, int freq, enum nl80211_channel_type channel_type); -u16 cfg80211_calculate_bitrate(struct rate_info *rate); - int ieee80211_get_ratemask(struct ieee80211_supported_band *sband, const u8 *rates, unsigned int n_rates, u32 *mask); |