diff options
| author | David S. Miller | 2008-09-20 01:17:12 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-09-20 01:17:12 +0200 |
| commit | d950f264ff7260d8c1e124158d758db13e1ad2d0 (patch) | |
| tree | 8a8758af70d72b94e51609a5088a5739d00d8793 /drivers/net/wireless/rt2x00/rt2x00config.c | |
| parent | qlge: Protect qlge_resume() with CONFIG_PM (diff) | |
| parent | libertas: correct "limited range of data type" warning (diff) | |
| download | kernel-qcow2-linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.gz kernel-qcow2-linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.xz kernel-qcow2-linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00config.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c index ca051f50ef10..4d5e87b015a0 100644 --- a/drivers/net/wireless/rt2x00/rt2x00config.c +++ b/drivers/net/wireless/rt2x00/rt2x00config.c @@ -31,7 +31,7 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev, struct rt2x00_intf *intf, - enum ieee80211_if_types type, + enum nl80211_iftype type, u8 *mac, u8 *bssid) { struct rt2x00intf_conf conf; @@ -40,11 +40,11 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev, conf.type = type; switch (type) { - case IEEE80211_IF_TYPE_IBSS: - case IEEE80211_IF_TYPE_AP: + case NL80211_IFTYPE_ADHOC: + case NL80211_IFTYPE_AP: conf.sync = TSF_SYNC_BEACON; break; - case IEEE80211_IF_TYPE_STA: + case NL80211_IFTYPE_STATION: conf.sync = TSF_SYNC_INFRA; break; default: |