diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-09-10 18:01:58 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-09-15 16:48:23 -0400 |
commit | 05c914fe330fa8e1cc67870dc0d3809dfd96c107 (patch) | |
tree | df53bcab47335f3361c09478d6b1447b7d298536 /drivers/net/wireless/libertas_tf | |
parent | 96dd22ac06b0dbfb069fdf530c72046a941e9694 (diff) |
mac80211: use nl80211 interface types
There's really no reason for mac80211 to be using its
own interface type defines. Use the nl80211 types and
simplify the configuration code a bit: there's no need
to translate them any more now.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas_tf')
-rw-r--r-- | drivers/net/wireless/libertas_tf/main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c index c948021bff6..feff945ad85 100644 --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c | |||
@@ -219,7 +219,7 @@ static void lbtf_tx_work(struct work_struct *work) | |||
219 | struct sk_buff *skb = NULL; | 219 | struct sk_buff *skb = NULL; |
220 | int err; | 220 | int err; |
221 | 221 | ||
222 | if ((priv->vif->type == IEEE80211_IF_TYPE_AP) && | 222 | if ((priv->vif->type == NL80211_IFTYPE_AP) && |
223 | (!skb_queue_empty(&priv->bc_ps_buf))) | 223 | (!skb_queue_empty(&priv->bc_ps_buf))) |
224 | skb = skb_dequeue(&priv->bc_ps_buf); | 224 | skb = skb_dequeue(&priv->bc_ps_buf); |
225 | else if (priv->skb_to_tx) { | 225 | else if (priv->skb_to_tx) { |
@@ -326,11 +326,11 @@ static int lbtf_op_add_interface(struct ieee80211_hw *hw, | |||
326 | 326 | ||
327 | priv->vif = conf->vif; | 327 | priv->vif = conf->vif; |
328 | switch (conf->type) { | 328 | switch (conf->type) { |
329 | case IEEE80211_IF_TYPE_MESH_POINT: | 329 | case NL80211_IFTYPE_MESH_POINT: |
330 | case IEEE80211_IF_TYPE_AP: | 330 | case NL80211_IFTYPE_AP: |
331 | lbtf_set_mode(priv, LBTF_AP_MODE); | 331 | lbtf_set_mode(priv, LBTF_AP_MODE); |
332 | break; | 332 | break; |
333 | case IEEE80211_IF_TYPE_STA: | 333 | case NL80211_IFTYPE_STATION: |
334 | lbtf_set_mode(priv, LBTF_STA_MODE); | 334 | lbtf_set_mode(priv, LBTF_STA_MODE); |
335 | break; | 335 | break; |
336 | default: | 336 | default: |
@@ -346,8 +346,8 @@ static void lbtf_op_remove_interface(struct ieee80211_hw *hw, | |||
346 | { | 346 | { |
347 | struct lbtf_private *priv = hw->priv; | 347 | struct lbtf_private *priv = hw->priv; |
348 | 348 | ||
349 | if (priv->vif->type == IEEE80211_IF_TYPE_AP || | 349 | if (priv->vif->type == NL80211_IFTYPE_AP || |
350 | priv->vif->type == IEEE80211_IF_TYPE_MESH_POINT) | 350 | priv->vif->type == NL80211_IFTYPE_MESH_POINT) |
351 | lbtf_beacon_ctrl(priv, 0, 0); | 351 | lbtf_beacon_ctrl(priv, 0, 0); |
352 | lbtf_set_mode(priv, LBTF_PASSIVE_MODE); | 352 | lbtf_set_mode(priv, LBTF_PASSIVE_MODE); |
353 | lbtf_set_bssid(priv, 0, NULL); | 353 | lbtf_set_bssid(priv, 0, NULL); |
@@ -372,8 +372,8 @@ static int lbtf_op_config_interface(struct ieee80211_hw *hw, | |||
372 | struct sk_buff *beacon; | 372 | struct sk_buff *beacon; |
373 | 373 | ||
374 | switch (priv->vif->type) { | 374 | switch (priv->vif->type) { |
375 | case IEEE80211_IF_TYPE_AP: | 375 | case NL80211_IFTYPE_AP: |
376 | case IEEE80211_IF_TYPE_MESH_POINT: | 376 | case NL80211_IFTYPE_MESH_POINT: |
377 | beacon = ieee80211_beacon_get(hw, vif); | 377 | beacon = ieee80211_beacon_get(hw, vif); |
378 | if (beacon) { | 378 | if (beacon) { |
379 | lbtf_beacon_set(priv, beacon); | 379 | lbtf_beacon_set(priv, beacon); |
@@ -614,7 +614,7 @@ void lbtf_bcn_sent(struct lbtf_private *priv) | |||
614 | { | 614 | { |
615 | struct sk_buff *skb = NULL; | 615 | struct sk_buff *skb = NULL; |
616 | 616 | ||
617 | if (priv->vif->type != IEEE80211_IF_TYPE_AP) | 617 | if (priv->vif->type != NL80211_IFTYPE_AP) |
618 | return; | 618 | return; |
619 | 619 | ||
620 | if (skb_queue_empty(&priv->bc_ps_buf)) { | 620 | if (skb_queue_empty(&priv->bc_ps_buf)) { |