Commit 40faacc4 authored by Michael Buesch's avatar Michael Buesch Committed by David S. Miller
Browse files

b43: consistent naming for ieee80211_ops 



Use a consistent naming scheme for the ops.

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 74cfdba7

drivers/net/wireless/b43/main.c

+38 −37
Original line number Diff line number Diff line
@@ -2483,8 +2483,9 @@ static int b43_rng_init(struct b43_wl *wl) 
	return err;

}



static int b43_tx(struct ieee80211_hw *hw,

		  struct sk_buff *skb, struct ieee80211_tx_control *ctl)

static int b43_op_tx(struct ieee80211_hw *hw,

		     struct sk_buff *skb,

		     struct ieee80211_tx_control *ctl)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);

	struct b43_wldev *dev = wl->current_dev;
@@ -2508,14 +2509,14 @@ static int b43_tx(struct ieee80211_hw *hw, 
	return NETDEV_TX_OK;

}



static int b43_conf_tx(struct ieee80211_hw *hw,

static int b43_op_conf_tx(struct ieee80211_hw *hw,

			  int queue,

			  const struct ieee80211_tx_queue_params *params)

{

	return 0;

}



static int b43_get_tx_stats(struct ieee80211_hw *hw,

static int b43_op_get_tx_stats(struct ieee80211_hw *hw,

			       struct ieee80211_tx_queue_stats *stats)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);
@@ -2538,7 +2539,7 @@ static int b43_get_tx_stats(struct ieee80211_hw *hw, 
	return err;

}



static int b43_get_stats(struct ieee80211_hw *hw,

static int b43_op_get_stats(struct ieee80211_hw *hw,

			    struct ieee80211_low_level_stats *stats)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);
@@ -2692,7 +2693,7 @@ static int b43_antenna_from_ieee80211(u8 antenna) 
	}

}



static int b43_dev_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)

static int b43_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);

	struct b43_wldev *dev;
@@ -2797,7 +2798,7 @@ static int b43_dev_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) 
	return err;

}



static int b43_dev_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

			   const u8 *local_addr, const u8 *addr,

			   struct ieee80211_key_conf *key)

{
@@ -2886,7 +2887,6 @@ static int b43_dev_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
out_unlock:

	spin_unlock_irqrestore(&wl->irq_lock, flags);

	mutex_unlock(&wl->mutex);

out:

	if (!err) {

		b43dbg(wl, "%s hardware based encryption for keyidx: %d, "

		       "mac: %s\n",
@@ -2896,7 +2896,7 @@ static int b43_dev_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	return err;

}



static void b43_configure_filter(struct ieee80211_hw *hw,

static void b43_op_configure_filter(struct ieee80211_hw *hw,

				    unsigned int changed, unsigned int *fflags,

				    int mc_count, struct dev_addr_list *mc_list)

{
@@ -2933,8 +2933,9 @@ static void b43_configure_filter(struct ieee80211_hw *hw, 
	spin_unlock_irqrestore(&wl->irq_lock, flags);

}



static int b43_config_interface(struct ieee80211_hw *hw,

				int if_id, struct ieee80211_if_conf *conf)

static int b43_op_config_interface(struct ieee80211_hw *hw,

				   int if_id,

				   struct ieee80211_if_conf *conf)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);

	struct b43_wldev *dev = wl->current_dev;
@@ -3420,7 +3421,7 @@ static int b43_wireless_core_init(struct b43_wldev *dev) 
	return err;

}



static int b43_add_interface(struct ieee80211_hw *hw,

static int b43_op_add_interface(struct ieee80211_hw *hw,

				struct ieee80211_if_init_conf *conf)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);
@@ -3460,7 +3461,7 @@ static int b43_add_interface(struct ieee80211_hw *hw, 
	return err;

}



static void b43_remove_interface(struct ieee80211_hw *hw,

static void b43_op_remove_interface(struct ieee80211_hw *hw,

				    struct ieee80211_if_init_conf *conf)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);
@@ -3485,7 +3486,7 @@ static void b43_remove_interface(struct ieee80211_hw *hw, 
	mutex_unlock(&wl->mutex);

}



static int b43_start(struct ieee80211_hw *hw)

static int b43_op_start(struct ieee80211_hw *hw)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);

	struct b43_wldev *dev = wl->current_dev;
@@ -3520,7 +3521,7 @@ static int b43_start(struct ieee80211_hw *hw) 
	return err;

}



static void b43_stop(struct ieee80211_hw *hw)

static void b43_op_stop(struct ieee80211_hw *hw)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);

	struct b43_wldev *dev = wl->current_dev;
@@ -3555,18 +3556,18 @@ static int b43_op_set_retry_limit(struct ieee80211_hw *hw, 
}



static const struct ieee80211_ops b43_hw_ops = {

	.tx			= b43_tx,

	.conf_tx		= b43_conf_tx,

	.add_interface		= b43_add_interface,

	.remove_interface	= b43_remove_interface,

	.config			= b43_dev_config,

	.config_interface	= b43_config_interface,

	.configure_filter	= b43_configure_filter,

	.set_key		= b43_dev_set_key,

	.get_stats		= b43_get_stats,

	.get_tx_stats		= b43_get_tx_stats,

	.start			= b43_start,

	.stop			= b43_stop,

	.tx			= b43_op_tx,

	.conf_tx		= b43_op_conf_tx,

	.add_interface		= b43_op_add_interface,

	.remove_interface	= b43_op_remove_interface,

	.config			= b43_op_config,

	.config_interface	= b43_op_config_interface,

	.configure_filter	= b43_op_configure_filter,

	.set_key		= b43_op_set_key,

	.get_stats		= b43_op_get_stats,

	.get_tx_stats		= b43_op_get_tx_stats,

	.start			= b43_op_start,

	.stop			= b43_op_stop,

	.set_retry_limit	= b43_op_set_retry_limit,

};