Skip to content

L
linux-davinci
Commit 33a3dc93 authored by Stefano Brivio's avatar Stefano Brivio Committed by David S. Miller
Browse files
Options

b43legacy: use a consistent naming scheme for the ops 

Use a consistent naming scheme for the ops.

The patch to b43 by Michael Buesch <mb@bu3sch.de> has been ported to
b43legacy.
Signed-off-by: default avatarStefano Brivio <stefano.brivio@polimi.it>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0a6e1bee
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
drivers/net/wireless/b43legacy/main.c
View file @ 33a3dc93
...@@ -2285,9 +2285,9 @@ static int b43legacy_rng_init(struct b43legacy_wl *wl) ...@@ -2285,9 +2285,9 @@ static int b43legacy_rng_init(struct b43legacy_wl *wl)
return err; return err;
} }
static int b43legacy_tx(struct ieee80211_hw *hw, static int b43legacy_op_tx(struct ieee80211_hw *hw,
struct sk_buff *skb, struct sk_buff *skb,
struct ieee80211_tx_control *ctl) struct ieee80211_tx_control *ctl)
{ {
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw); struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
struct b43legacy_wldev *dev = wl->current_dev; struct b43legacy_wldev *dev = wl->current_dev;
...@@ -2311,15 +2311,15 @@ out: ...@@ -2311,15 +2311,15 @@ out:
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
static int b43legacy_conf_tx(struct ieee80211_hw *hw, static int b43legacy_op_conf_tx(struct ieee80211_hw *hw,
int queue, int queue,
const struct ieee80211_tx_queue_params *params) const struct ieee80211_tx_queue_params *params)
{ {
return 0; return 0;
} }
static int b43legacy_get_tx_stats(struct ieee80211_hw *hw, static int b43legacy_op_get_tx_stats(struct ieee80211_hw *hw,
struct ieee80211_tx_queue_stats *stats) struct ieee80211_tx_queue_stats *stats)
{ {
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw); struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
struct b43legacy_wldev *dev = wl->current_dev; struct b43legacy_wldev *dev = wl->current_dev;
...@@ -2341,8 +2341,8 @@ out: ...@@ -2341,8 +2341,8 @@ out:
return err; return err;
} }
static int b43legacy_get_stats(struct ieee80211_hw *hw, static int b43legacy_op_get_stats(struct ieee80211_hw *hw,
struct ieee80211_low_level_stats *stats) struct ieee80211_low_level_stats *stats)
{ {
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw); struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
unsigned long flags; unsigned long flags;
...@@ -2491,8 +2491,8 @@ static int b43legacy_antenna_from_ieee80211(u8 antenna) ...@@ -2491,8 +2491,8 @@ static int b43legacy_antenna_from_ieee80211(u8 antenna)
} }
} }
static int b43legacy_dev_config(struct ieee80211_hw *hw, static int b43legacy_op_dev_config(struct ieee80211_hw *hw,
struct ieee80211_conf *conf) struct ieee80211_conf *conf)
{ {
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw); struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
struct b43legacy_wldev *dev; struct b43legacy_wldev *dev;
...@@ -2595,11 +2595,11 @@ out_unlock_mutex: ...@@ -2595,11 +2595,11 @@ out_unlock_mutex:
return err; return err;
} }
static void b43legacy_configure_filter(struct ieee80211_hw *hw, static void b43legacy_op_configure_filter(struct ieee80211_hw *hw,
unsigned int changed, unsigned int changed,
unsigned int *fflags, unsigned int *fflags,
int mc_count, int mc_count,
struct dev_addr_list *mc_list) struct dev_addr_list *mc_list)
{ {
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw); struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
struct b43legacy_wldev *dev = wl->current_dev; struct b43legacy_wldev *dev = wl->current_dev;
...@@ -2634,9 +2634,9 @@ static void b43legacy_configure_filter(struct ieee80211_hw *hw, ...@@ -2634,9 +2634,9 @@ static void b43legacy_configure_filter(struct ieee80211_hw *hw,
spin_unlock_irqrestore(&wl->irq_lock, flags); spin_unlock_irqrestore(&wl->irq_lock, flags);
} }
static int b43legacy_config_interface(struct ieee80211_hw *hw, static int b43legacy_op_config_interface(struct ieee80211_hw *hw,
int if_id, int if_id,
struct ieee80211_if_conf *conf) struct ieee80211_if_conf *conf)
{ {
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw); struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
struct b43legacy_wldev *dev = wl->current_dev; struct b43legacy_wldev *dev = wl->current_dev;
...@@ -3144,8 +3144,8 @@ err_kfree_lo_control: ...@@ -3144,8 +3144,8 @@ err_kfree_lo_control:
return err; return err;
} }
static int b43legacy_add_interface(struct ieee80211_hw *hw, static int b43legacy_op_add_interface(struct ieee80211_hw *hw,
struct ieee80211_if_init_conf *conf) struct ieee80211_if_init_conf *conf)
{ {
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw); struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
struct b43legacy_wldev *dev; struct b43legacy_wldev *dev;
...@@ -3184,8 +3184,8 @@ static int b43legacy_add_interface(struct ieee80211_hw *hw, ...@@ -3184,8 +3184,8 @@ static int b43legacy_add_interface(struct ieee80211_hw *hw,
return err; return err;
} }
static void b43legacy_remove_interface(struct ieee80211_hw *hw, static void b43legacy_op_remove_interface(struct ieee80211_hw *hw,
struct ieee80211_if_init_conf *conf) struct ieee80211_if_init_conf *conf)
{ {
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw); struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
struct b43legacy_wldev *dev = wl->current_dev; struct b43legacy_wldev *dev = wl->current_dev;
...@@ -3209,7 +3209,7 @@ static void b43legacy_remove_interface(struct ieee80211_hw *hw, ...@@ -3209,7 +3209,7 @@ static void b43legacy_remove_interface(struct ieee80211_hw *hw,
mutex_unlock(&wl->mutex); mutex_unlock(&wl->mutex);
} }
static int b43legacy_start(struct ieee80211_hw *hw) static int b43legacy_op_start(struct ieee80211_hw *hw)
{ {
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw); struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
struct b43legacy_wldev *dev = wl->current_dev; struct b43legacy_wldev *dev = wl->current_dev;
...@@ -3240,7 +3240,7 @@ out_mutex_unlock: ...@@ -3240,7 +3240,7 @@ out_mutex_unlock:
return err; return err;
} }
static void b43legacy_stop(struct ieee80211_hw *hw) static void b43legacy_op_stop(struct ieee80211_hw *hw)
{ {
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw); struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
struct b43legacy_wldev *dev = wl->current_dev; struct b43legacy_wldev *dev = wl->current_dev;
...@@ -3275,17 +3275,17 @@ out_unlock: ...@@ -3275,17 +3275,17 @@ out_unlock:
} }
static const struct ieee80211_ops b43legacy_hw_ops = { static const struct ieee80211_ops b43legacy_hw_ops = {
.tx = b43legacy_tx, .tx = b43legacy_op_tx,
.conf_tx = b43legacy_conf_tx, .conf_tx = b43legacy_op_conf_tx,
.add_interface = b43legacy_add_interface, .add_interface = b43legacy_op_add_interface,
.remove_interface = b43legacy_remove_interface, .remove_interface = b43legacy_op_remove_interface,
.config = b43legacy_dev_config, .config = b43legacy_op_dev_config,
.config_interface = b43legacy_config_interface, .config_interface = b43legacy_op_config_interface,
.configure_filter = b43legacy_configure_filter, .configure_filter = b43legacy_op_configure_filter,
.get_stats = b43legacy_get_stats, .get_stats = b43legacy_op_get_stats,
.get_tx_stats = b43legacy_get_tx_stats, .get_tx_stats = b43legacy_op_get_tx_stats,
.start = b43legacy_start, .start = b43legacy_op_start,
.stop = b43legacy_stop, .stop = b43legacy_op_stop,
.set_retry_limit = b43legacy_op_set_retry_limit, .set_retry_limit = b43legacy_op_set_retry_limit,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment