Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33a3dc93 authored by Stefano Brivio's avatar Stefano Brivio Committed by David S. Miller
Browse files

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

drivers/net/wireless/b43legacy/main.c

+37 −37
Original line number Diff line number Diff line
@@ -2285,7 +2285,7 @@ static int b43legacy_rng_init(struct b43legacy_wl *wl) 
	return err;

}



static int b43legacy_tx(struct ieee80211_hw *hw,

static int b43legacy_op_tx(struct ieee80211_hw *hw,

			   struct sk_buff *skb,

			   struct ieee80211_tx_control *ctl)

{
@@ -2311,14 +2311,14 @@ static int b43legacy_tx(struct ieee80211_hw *hw, 
	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,

				const struct ieee80211_tx_queue_params *params)

{

	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 b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
@@ -2341,7 +2341,7 @@ static int b43legacy_get_tx_stats(struct ieee80211_hw *hw, 
	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 b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
@@ -2491,7 +2491,7 @@ 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 b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
@@ -2595,7 +2595,7 @@ static int b43legacy_dev_config(struct ieee80211_hw *hw, 
	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 *fflags,

					  int mc_count,
@@ -2634,7 +2634,7 @@ static void b43legacy_configure_filter(struct ieee80211_hw *hw, 
	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,

					 struct ieee80211_if_conf *conf)

{
@@ -3144,7 +3144,7 @@ static int b43legacy_wireless_core_init(struct b43legacy_wldev *dev) 
	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 b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
@@ -3184,7 +3184,7 @@ static int b43legacy_add_interface(struct ieee80211_hw *hw, 
	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 b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
@@ -3209,7 +3209,7 @@ static void b43legacy_remove_interface(struct ieee80211_hw *hw, 
	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_wldev *dev = wl->current_dev;
@@ -3240,7 +3240,7 @@ static int b43legacy_start(struct ieee80211_hw *hw) 
	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_wldev *dev = wl->current_dev;
@@ -3275,17 +3275,17 @@ static int b43legacy_op_set_retry_limit(struct ieee80211_hw *hw, 
}



static const struct ieee80211_ops b43legacy_hw_ops = {

	.tx			= b43legacy_tx,

	.conf_tx		= b43legacy_conf_tx,

	.add_interface		= b43legacy_add_interface,

	.remove_interface	= b43legacy_remove_interface,

	.config			= b43legacy_dev_config,

	.config_interface	= b43legacy_config_interface,

	.configure_filter	= b43legacy_configure_filter,

	.get_stats		= b43legacy_get_stats,

	.get_tx_stats		= b43legacy_get_tx_stats,

	.start			= b43legacy_start,

	.stop			= b43legacy_stop,

	.tx			= b43legacy_op_tx,

	.conf_tx		= b43legacy_op_conf_tx,

	.add_interface		= b43legacy_op_add_interface,

	.remove_interface	= b43legacy_op_remove_interface,

	.config			= b43legacy_op_dev_config,

	.config_interface	= b43legacy_op_config_interface,

	.configure_filter	= b43legacy_op_configure_filter,

	.get_stats		= b43legacy_op_get_stats,

	.get_tx_stats		= b43legacy_op_get_tx_stats,

	.start			= b43legacy_op_start,

	.stop			= b43legacy_op_stop,

	.set_retry_limit	= b43legacy_op_set_retry_limit,

};