aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43/main.c
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2007-10-28 11:29:32 -0400
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:03:31 -0500
commit40faacc4078d0fef6daaf6f5d1d332d08631bdd8 (patch)
treec75d0cd0017bcefcd902ef4d4fc78f96b04646cf /drivers/net/wireless/b43/main.c
parent74cfdba7ce7b601559a4bcdc9054baf1bdc6948d (diff)
b43: consistent naming for ieee80211_ops
Use a consistent naming scheme for the ops. Signed-off-by: Michael Buesch <mb@bu3sch.de> Cc: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r--drivers/net/wireless/b43/main.c75
1 files changed, 38 insertions, 37 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 178ad9120107..4373ec903ad1 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2483,8 +2483,9 @@ static int b43_rng_init(struct b43_wl *wl)
2483 return err; 2483 return err;
2484} 2484}
2485 2485
2486static int b43_tx(struct ieee80211_hw *hw, 2486static int b43_op_tx(struct ieee80211_hw *hw,
2487 struct sk_buff *skb, struct ieee80211_tx_control *ctl) 2487 struct sk_buff *skb,
2488 struct ieee80211_tx_control *ctl)
2488{ 2489{
2489 struct b43_wl *wl = hw_to_b43_wl(hw); 2490 struct b43_wl *wl = hw_to_b43_wl(hw);
2490 struct b43_wldev *dev = wl->current_dev; 2491 struct b43_wldev *dev = wl->current_dev;
@@ -2502,21 +2503,21 @@ static int b43_tx(struct ieee80211_hw *hw,
2502 spin_unlock_irqrestore(&wl->irq_lock, flags); 2503 spin_unlock_irqrestore(&wl->irq_lock, flags);
2503 } else 2504 } else
2504 err = b43_dma_tx(dev, skb, ctl); 2505 err = b43_dma_tx(dev, skb, ctl);
2505 out: 2506out:
2506 if (unlikely(err)) 2507 if (unlikely(err))
2507 return NETDEV_TX_BUSY; 2508 return NETDEV_TX_BUSY;
2508 return NETDEV_TX_OK; 2509 return NETDEV_TX_OK;
2509} 2510}
2510 2511
2511static int b43_conf_tx(struct ieee80211_hw *hw, 2512static int b43_op_conf_tx(struct ieee80211_hw *hw,
2512 int queue, 2513 int queue,
2513 const struct ieee80211_tx_queue_params *params) 2514 const struct ieee80211_tx_queue_params *params)
2514{ 2515{
2515 return 0; 2516 return 0;
2516} 2517}
2517 2518
2518static int b43_get_tx_stats(struct ieee80211_hw *hw, 2519static int b43_op_get_tx_stats(struct ieee80211_hw *hw,
2519 struct ieee80211_tx_queue_stats *stats) 2520 struct ieee80211_tx_queue_stats *stats)
2520{ 2521{
2521 struct b43_wl *wl = hw_to_b43_wl(hw); 2522 struct b43_wl *wl = hw_to_b43_wl(hw);
2522 struct b43_wldev *dev = wl->current_dev; 2523 struct b43_wldev *dev = wl->current_dev;
@@ -2534,12 +2535,12 @@ static int b43_get_tx_stats(struct ieee80211_hw *hw,
2534 err = 0; 2535 err = 0;
2535 } 2536 }
2536 spin_unlock_irqrestore(&wl->irq_lock, flags); 2537 spin_unlock_irqrestore(&wl->irq_lock, flags);
2537 out: 2538out:
2538 return err; 2539 return err;
2539} 2540}
2540 2541
2541static int b43_get_stats(struct ieee80211_hw *hw, 2542static int b43_op_get_stats(struct ieee80211_hw *hw,
2542 struct ieee80211_low_level_stats *stats) 2543 struct ieee80211_low_level_stats *stats)
2543{ 2544{
2544 struct b43_wl *wl = hw_to_b43_wl(hw); 2545 struct b43_wl *wl = hw_to_b43_wl(hw);
2545 unsigned long flags; 2546 unsigned long flags;
@@ -2692,7 +2693,7 @@ static int b43_antenna_from_ieee80211(u8 antenna)
2692 } 2693 }
2693} 2694}
2694 2695
2695static int b43_dev_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) 2696static int b43_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
2696{ 2697{
2697 struct b43_wl *wl = hw_to_b43_wl(hw); 2698 struct b43_wl *wl = hw_to_b43_wl(hw);
2698 struct b43_wldev *dev; 2699 struct b43_wldev *dev;
@@ -2797,7 +2798,7 @@ static int b43_dev_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
2797 return err; 2798 return err;
2798} 2799}
2799 2800
2800static int b43_dev_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 2801static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
2801 const u8 *local_addr, const u8 *addr, 2802 const u8 *local_addr, const u8 *addr,
2802 struct ieee80211_key_conf *key) 2803 struct ieee80211_key_conf *key)
2803{ 2804{
@@ -2886,7 +2887,6 @@ static int b43_dev_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
2886out_unlock: 2887out_unlock:
2887 spin_unlock_irqrestore(&wl->irq_lock, flags); 2888 spin_unlock_irqrestore(&wl->irq_lock, flags);
2888 mutex_unlock(&wl->mutex); 2889 mutex_unlock(&wl->mutex);
2889out:
2890 if (!err) { 2890 if (!err) {
2891 b43dbg(wl, "%s hardware based encryption for keyidx: %d, " 2891 b43dbg(wl, "%s hardware based encryption for keyidx: %d, "
2892 "mac: %s\n", 2892 "mac: %s\n",
@@ -2896,9 +2896,9 @@ out:
2896 return err; 2896 return err;
2897} 2897}
2898 2898
2899static void b43_configure_filter(struct ieee80211_hw *hw, 2899static void b43_op_configure_filter(struct ieee80211_hw *hw,
2900 unsigned int changed, unsigned int *fflags, 2900 unsigned int changed, unsigned int *fflags,
2901 int mc_count, struct dev_addr_list *mc_list) 2901 int mc_count, struct dev_addr_list *mc_list)
2902{ 2902{
2903 struct b43_wl *wl = hw_to_b43_wl(hw); 2903 struct b43_wl *wl = hw_to_b43_wl(hw);
2904 struct b43_wldev *dev = wl->current_dev; 2904 struct b43_wldev *dev = wl->current_dev;
@@ -2933,8 +2933,9 @@ static void b43_configure_filter(struct ieee80211_hw *hw,
2933 spin_unlock_irqrestore(&wl->irq_lock, flags); 2933 spin_unlock_irqrestore(&wl->irq_lock, flags);
2934} 2934}
2935 2935
2936static int b43_config_interface(struct ieee80211_hw *hw, 2936static int b43_op_config_interface(struct ieee80211_hw *hw,
2937 int if_id, struct ieee80211_if_conf *conf) 2937 int if_id,
2938 struct ieee80211_if_conf *conf)
2938{ 2939{
2939 struct b43_wl *wl = hw_to_b43_wl(hw); 2940 struct b43_wl *wl = hw_to_b43_wl(hw);
2940 struct b43_wldev *dev = wl->current_dev; 2941 struct b43_wldev *dev = wl->current_dev;
@@ -3420,8 +3421,8 @@ out:
3420 return err; 3421 return err;
3421} 3422}
3422 3423
3423static int b43_add_interface(struct ieee80211_hw *hw, 3424static int b43_op_add_interface(struct ieee80211_hw *hw,
3424 struct ieee80211_if_init_conf *conf) 3425 struct ieee80211_if_init_conf *conf)
3425{ 3426{
3426 struct b43_wl *wl = hw_to_b43_wl(hw); 3427 struct b43_wl *wl = hw_to_b43_wl(hw);
3427 struct b43_wldev *dev; 3428 struct b43_wldev *dev;
@@ -3460,8 +3461,8 @@ static int b43_add_interface(struct ieee80211_hw *hw,
3460 return err; 3461 return err;
3461} 3462}
3462 3463
3463static void b43_remove_interface(struct ieee80211_hw *hw, 3464static void b43_op_remove_interface(struct ieee80211_hw *hw,
3464 struct ieee80211_if_init_conf *conf) 3465 struct ieee80211_if_init_conf *conf)
3465{ 3466{
3466 struct b43_wl *wl = hw_to_b43_wl(hw); 3467 struct b43_wl *wl = hw_to_b43_wl(hw);
3467 struct b43_wldev *dev = wl->current_dev; 3468 struct b43_wldev *dev = wl->current_dev;
@@ -3485,7 +3486,7 @@ static void b43_remove_interface(struct ieee80211_hw *hw,
3485 mutex_unlock(&wl->mutex); 3486 mutex_unlock(&wl->mutex);
3486} 3487}
3487 3488
3488static int b43_start(struct ieee80211_hw *hw) 3489static int b43_op_start(struct ieee80211_hw *hw)
3489{ 3490{
3490 struct b43_wl *wl = hw_to_b43_wl(hw); 3491 struct b43_wl *wl = hw_to_b43_wl(hw);
3491 struct b43_wldev *dev = wl->current_dev; 3492 struct b43_wldev *dev = wl->current_dev;
@@ -3520,7 +3521,7 @@ static int b43_start(struct ieee80211_hw *hw)
3520 return err; 3521 return err;
3521} 3522}
3522 3523
3523static void b43_stop(struct ieee80211_hw *hw) 3524static void b43_op_stop(struct ieee80211_hw *hw)
3524{ 3525{
3525 struct b43_wl *wl = hw_to_b43_wl(hw); 3526 struct b43_wl *wl = hw_to_b43_wl(hw);
3526 struct b43_wldev *dev = wl->current_dev; 3527 struct b43_wldev *dev = wl->current_dev;
@@ -3555,18 +3556,18 @@ out_unlock:
3555} 3556}
3556 3557
3557static const struct ieee80211_ops b43_hw_ops = { 3558static const struct ieee80211_ops b43_hw_ops = {
3558 .tx = b43_tx, 3559 .tx = b43_op_tx,
3559 .conf_tx = b43_conf_tx, 3560 .conf_tx = b43_op_conf_tx,
3560 .add_interface = b43_add_interface, 3561 .add_interface = b43_op_add_interface,
3561 .remove_interface = b43_remove_interface, 3562 .remove_interface = b43_op_remove_interface,
3562 .config = b43_dev_config, 3563 .config = b43_op_config,
3563 .config_interface = b43_config_interface, 3564 .config_interface = b43_op_config_interface,
3564 .configure_filter = b43_configure_filter, 3565 .configure_filter = b43_op_configure_filter,
3565 .set_key = b43_dev_set_key, 3566 .set_key = b43_op_set_key,
3566 .get_stats = b43_get_stats, 3567 .get_stats = b43_op_get_stats,
3567 .get_tx_stats = b43_get_tx_stats, 3568 .get_tx_stats = b43_op_get_tx_stats,
3568 .start = b43_start, 3569 .start = b43_op_start,
3569 .stop = b43_stop, 3570 .stop = b43_op_stop,
3570 .set_retry_limit = b43_op_set_retry_limit, 3571 .set_retry_limit = b43_op_set_retry_limit,
3571}; 3572};
3572 3573