Commit 119ea186 authored by Wey-Yi Guy's avatar Wey-Yi Guy

iwlagn: remove un-necessary ieee80211_ops

After driver split, no need to use ieee80211_ops, remove it
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 5cab35e7
...@@ -220,7 +220,6 @@ static const struct iwl_ops iwl1000_ops = { ...@@ -220,7 +220,6 @@ static const struct iwl_ops iwl1000_ops = {
.lib = &iwl1000_lib, .lib = &iwl1000_lib,
.hcmd = &iwlagn_hcmd, .hcmd = &iwlagn_hcmd,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
.ieee80211_ops = &iwlagn_hw_ops,
}; };
static struct iwl_base_params iwl1000_base_params = { static struct iwl_base_params iwl1000_base_params = {
......
...@@ -304,28 +304,24 @@ static const struct iwl_ops iwl2000_ops = { ...@@ -304,28 +304,24 @@ static const struct iwl_ops iwl2000_ops = {
.lib = &iwl2000_lib, .lib = &iwl2000_lib,
.hcmd = &iwlagn_hcmd, .hcmd = &iwlagn_hcmd,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
.ieee80211_ops = &iwlagn_hw_ops,
}; };
static const struct iwl_ops iwl2030_ops = { static const struct iwl_ops iwl2030_ops = {
.lib = &iwl2000_lib, .lib = &iwl2000_lib,
.hcmd = &iwlagn_bt_hcmd, .hcmd = &iwlagn_bt_hcmd,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
.ieee80211_ops = &iwlagn_hw_ops,
}; };
static const struct iwl_ops iwl200_ops = { static const struct iwl_ops iwl200_ops = {
.lib = &iwl2000_lib, .lib = &iwl2000_lib,
.hcmd = &iwlagn_hcmd, .hcmd = &iwlagn_hcmd,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
.ieee80211_ops = &iwlagn_hw_ops,
}; };
static const struct iwl_ops iwl230_ops = { static const struct iwl_ops iwl230_ops = {
.lib = &iwl2000_lib, .lib = &iwl2000_lib,
.hcmd = &iwlagn_bt_hcmd, .hcmd = &iwlagn_bt_hcmd,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
.ieee80211_ops = &iwlagn_hw_ops,
}; };
static struct iwl_base_params iwl2000_base_params = { static struct iwl_base_params iwl2000_base_params = {
......
...@@ -436,14 +436,12 @@ static const struct iwl_ops iwl5000_ops = { ...@@ -436,14 +436,12 @@ static const struct iwl_ops iwl5000_ops = {
.lib = &iwl5000_lib, .lib = &iwl5000_lib,
.hcmd = &iwlagn_hcmd, .hcmd = &iwlagn_hcmd,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
.ieee80211_ops = &iwlagn_hw_ops,
}; };
static const struct iwl_ops iwl5150_ops = { static const struct iwl_ops iwl5150_ops = {
.lib = &iwl5150_lib, .lib = &iwl5150_lib,
.hcmd = &iwlagn_hcmd, .hcmd = &iwlagn_hcmd,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
.ieee80211_ops = &iwlagn_hw_ops,
}; };
static struct iwl_base_params iwl5000_base_params = { static struct iwl_base_params iwl5000_base_params = {
......
...@@ -386,7 +386,6 @@ static const struct iwl_ops iwl6000_ops = { ...@@ -386,7 +386,6 @@ static const struct iwl_ops iwl6000_ops = {
.lib = &iwl6000_lib, .lib = &iwl6000_lib,
.hcmd = &iwlagn_hcmd, .hcmd = &iwlagn_hcmd,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
.ieee80211_ops = &iwlagn_hw_ops,
}; };
static const struct iwl_ops iwl6050_ops = { static const struct iwl_ops iwl6050_ops = {
...@@ -394,7 +393,6 @@ static const struct iwl_ops iwl6050_ops = { ...@@ -394,7 +393,6 @@ static const struct iwl_ops iwl6050_ops = {
.hcmd = &iwlagn_hcmd, .hcmd = &iwlagn_hcmd,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
.nic = &iwl6050_nic_ops, .nic = &iwl6050_nic_ops,
.ieee80211_ops = &iwlagn_hw_ops,
}; };
static const struct iwl_ops iwl6150_ops = { static const struct iwl_ops iwl6150_ops = {
...@@ -402,14 +400,12 @@ static const struct iwl_ops iwl6150_ops = { ...@@ -402,14 +400,12 @@ static const struct iwl_ops iwl6150_ops = {
.hcmd = &iwlagn_hcmd, .hcmd = &iwlagn_hcmd,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
.nic = &iwl6150_nic_ops, .nic = &iwl6150_nic_ops,
.ieee80211_ops = &iwlagn_hw_ops,
}; };
static const struct iwl_ops iwl6030_ops = { static const struct iwl_ops iwl6030_ops = {
.lib = &iwl6030_lib, .lib = &iwl6030_lib,
.hcmd = &iwlagn_bt_hcmd, .hcmd = &iwlagn_bt_hcmd,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
.ieee80211_ops = &iwlagn_hw_ops,
}; };
static struct iwl_base_params iwl6000_base_params = { static struct iwl_base_params iwl6000_base_params = {
......
...@@ -3728,6 +3728,28 @@ static const u8 iwlagn_pan_ac_to_queue[] = { ...@@ -3728,6 +3728,28 @@ static const u8 iwlagn_pan_ac_to_queue[] = {
7, 6, 5, 4, 7, 6, 5, 4,
}; };
/* This function both allocates and initializes hw and priv. */
static struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg)
{
struct iwl_priv *priv;
/* mac80211 allocates memory for this device instance, including
* space for this driver's private structure */
struct ieee80211_hw *hw;
hw = ieee80211_alloc_hw(sizeof(struct iwl_priv), &iwlagn_hw_ops);
if (hw == NULL) {
pr_err("%s: Can not allocate network device\n",
cfg->name);
goto out;
}
priv = hw->priv;
priv->hw = hw;
out:
return hw;
}
static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
int err = 0, i; int err = 0, i;
......
...@@ -67,30 +67,6 @@ u32 iwl_debug_level; ...@@ -67,30 +67,6 @@ u32 iwl_debug_level;
const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
/* This function both allocates and initializes hw and priv. */
struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg)
{
struct iwl_priv *priv;
/* mac80211 allocates memory for this device instance, including
* space for this driver's private structure */
struct ieee80211_hw *hw;
hw = ieee80211_alloc_hw(sizeof(struct iwl_priv),
cfg->ops->ieee80211_ops);
if (hw == NULL) {
pr_err("%s: Can not allocate network device\n",
cfg->name);
goto out;
}
priv = hw->priv;
priv->hw = hw;
out:
return hw;
}
#define MAX_BIT_RATE_40_MHZ 150 /* Mbps */ #define MAX_BIT_RATE_40_MHZ 150 /* Mbps */
#define MAX_BIT_RATE_20_MHZ 72 /* Mbps */ #define MAX_BIT_RATE_20_MHZ 72 /* Mbps */
static void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv, static void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv,
......
...@@ -210,7 +210,6 @@ struct iwl_ops { ...@@ -210,7 +210,6 @@ struct iwl_ops {
const struct iwl_hcmd_utils_ops *utils; const struct iwl_hcmd_utils_ops *utils;
const struct iwl_nic_ops *nic; const struct iwl_nic_ops *nic;
const struct iwl_legacy_ops *legacy; const struct iwl_legacy_ops *legacy;
const struct ieee80211_ops *ieee80211_ops;
}; };
struct iwl_mod_params { struct iwl_mod_params {
...@@ -364,7 +363,6 @@ struct iwl_cfg { ...@@ -364,7 +363,6 @@ struct iwl_cfg {
* L i b * * L i b *
***************************/ ***************************/
struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg);
int iwl_mac_conf_tx(struct ieee80211_hw *hw, u16 queue, int iwl_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,
const struct ieee80211_tx_queue_params *params); const struct ieee80211_tx_queue_params *params);
int iwl_mac_tx_last_beacon(struct ieee80211_hw *hw); int iwl_mac_tx_last_beacon(struct ieee80211_hw *hw);
......
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