UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Gertjan van Wingerde <gwingerde@gmail.com>
Cc: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Gertjan van Wingerde 2012-09-23 20:22:53 +02:00 committed by John W. Linville
parent fd0fc5218d
commit 3e4c4151e5
9 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/rt2x00/rt2400pci.c
View File

@ -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,

1
drivers/net/wireless/rt2x00/rt2500pci.c
View File

@ -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,

1
drivers/net/wireless/rt2x00/rt2500usb.c
View File

@ -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,

1
drivers/net/wireless/rt2x00/rt2800pci.c
View File

@ -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,

1
drivers/net/wireless/rt2x00/rt2800usb.c
View File

@ -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,

1
drivers/net/wireless/rt2x00/rt2x00.h
View File

@ -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;

5
drivers/net/wireless/rt2x00/rt2x00mac.c
View File

@ -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;

1
drivers/net/wireless/rt2x00/rt61pci.c
View File

@ -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,

1
drivers/net/wireless/rt2x00/rt73usb.c
View File

@ -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,