Commit 3e4c4151 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville

rt2x00: Deprecate max_sta_intf field of struct rt2x00_ops.

All drivers set this value to 1, so there is no need (currently) to let
drivers set this.
Therefor, remove the field; we can always add it back when it is needed.

Inspired by an earlier patch from Paul Fertser.
Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Cc: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fd0fc521
...@@ -1789,7 +1789,6 @@ static const struct data_queue_desc rt2400pci_queue_atim = { ...@@ -1789,7 +1789,6 @@ static const struct data_queue_desc rt2400pci_queue_atim = {
static const struct rt2x00_ops rt2400pci_ops = { static const struct rt2x00_ops rt2400pci_ops = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.max_sta_intf = 1,
.max_ap_intf = 1, .max_ap_intf = 1,
.eeprom_size = EEPROM_SIZE, .eeprom_size = EEPROM_SIZE,
.rf_size = RF_SIZE, .rf_size = RF_SIZE,
......
...@@ -2081,7 +2081,6 @@ static const struct data_queue_desc rt2500pci_queue_atim = { ...@@ -2081,7 +2081,6 @@ static const struct data_queue_desc rt2500pci_queue_atim = {
static const struct rt2x00_ops rt2500pci_ops = { static const struct rt2x00_ops rt2500pci_ops = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.max_sta_intf = 1,
.max_ap_intf = 1, .max_ap_intf = 1,
.eeprom_size = EEPROM_SIZE, .eeprom_size = EEPROM_SIZE,
.rf_size = RF_SIZE, .rf_size = RF_SIZE,
......
...@@ -1896,7 +1896,6 @@ static const struct data_queue_desc rt2500usb_queue_atim = { ...@@ -1896,7 +1896,6 @@ static const struct data_queue_desc rt2500usb_queue_atim = {
static const struct rt2x00_ops rt2500usb_ops = { static const struct rt2x00_ops rt2500usb_ops = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.max_sta_intf = 1,
.max_ap_intf = 1, .max_ap_intf = 1,
.eeprom_size = EEPROM_SIZE, .eeprom_size = EEPROM_SIZE,
.rf_size = RF_SIZE, .rf_size = RF_SIZE,
......
...@@ -1088,7 +1088,6 @@ static const struct data_queue_desc rt2800pci_queue_bcn = { ...@@ -1088,7 +1088,6 @@ static const struct data_queue_desc rt2800pci_queue_bcn = {
static const struct rt2x00_ops rt2800pci_ops = { static const struct rt2x00_ops rt2800pci_ops = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.drv_data_size = sizeof(struct rt2800_drv_data), .drv_data_size = sizeof(struct rt2800_drv_data),
.max_sta_intf = 1,
.max_ap_intf = 8, .max_ap_intf = 8,
.eeprom_size = EEPROM_SIZE, .eeprom_size = EEPROM_SIZE,
.rf_size = RF_SIZE, .rf_size = RF_SIZE,
......
...@@ -870,7 +870,6 @@ static const struct data_queue_desc rt2800usb_queue_bcn = { ...@@ -870,7 +870,6 @@ static const struct data_queue_desc rt2800usb_queue_bcn = {
static const struct rt2x00_ops rt2800usb_ops = { static const struct rt2x00_ops rt2800usb_ops = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.drv_data_size = sizeof(struct rt2800_drv_data), .drv_data_size = sizeof(struct rt2800_drv_data),
.max_sta_intf = 1,
.max_ap_intf = 8, .max_ap_intf = 8,
.eeprom_size = EEPROM_SIZE, .eeprom_size = EEPROM_SIZE,
.rf_size = RF_SIZE, .rf_size = RF_SIZE,
......
...@@ -656,7 +656,6 @@ struct rt2x00lib_ops { ...@@ -656,7 +656,6 @@ struct rt2x00lib_ops {
struct rt2x00_ops { struct rt2x00_ops {
const char *name; const char *name;
const unsigned int drv_data_size; const unsigned int drv_data_size;
const unsigned int max_sta_intf;
const unsigned int max_ap_intf; const unsigned int max_ap_intf;
const unsigned int eeprom_size; const unsigned int eeprom_size;
const unsigned int rf_size; const unsigned int rf_size;
......
...@@ -243,10 +243,9 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw, ...@@ -243,10 +243,9 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
return -ENOBUFS; return -ENOBUFS;
/* /*
* Check if we exceeded the maximum amount * We don't support multiple STA interfaces.
* of supported interfaces.
*/ */
if (rt2x00dev->intf_sta_count >= rt2x00dev->ops->max_sta_intf) if (rt2x00dev->intf_sta_count)
return -ENOBUFS; return -ENOBUFS;
break; break;
......
...@@ -3045,7 +3045,6 @@ static const struct data_queue_desc rt61pci_queue_bcn = { ...@@ -3045,7 +3045,6 @@ static const struct data_queue_desc rt61pci_queue_bcn = {
static const struct rt2x00_ops rt61pci_ops = { static const struct rt2x00_ops rt61pci_ops = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.max_sta_intf = 1,
.max_ap_intf = 4, .max_ap_intf = 4,
.eeprom_size = EEPROM_SIZE, .eeprom_size = EEPROM_SIZE,
.rf_size = RF_SIZE, .rf_size = RF_SIZE,
......
...@@ -2382,7 +2382,6 @@ static const struct data_queue_desc rt73usb_queue_bcn = { ...@@ -2382,7 +2382,6 @@ static const struct data_queue_desc rt73usb_queue_bcn = {
static const struct rt2x00_ops rt73usb_ops = { static const struct rt2x00_ops rt73usb_ops = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.max_sta_intf = 1,
.max_ap_intf = 4, .max_ap_intf = 4,
.eeprom_size = EEPROM_SIZE, .eeprom_size = EEPROM_SIZE,
.rf_size = RF_SIZE, .rf_size = RF_SIZE,
......
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