qlcnic: Remove validation for max tx and max rx queues
authorRajesh Borundia <rajesh.borundia@qlogic.com>
Wed, 23 Feb 2011 03:21:25 +0000 (03:21 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Feb 2011 22:23:33 +0000 (14:23 -0800)
Max rx queues and tx queues are governed by fimware.
So driver should not validate these values.

Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/qlcnic/qlcnic.h
drivers/net/qlcnic/qlcnic_main.c

index fa7f794de29c57571c580cc294e41c7a0b135d53..dc44564ef6f9984fdc9a214491d9bdced015eb80 100644 (file)
@@ -1132,14 +1132,10 @@ struct qlcnic_eswitch {
 #define MAX_BW                 100     /* % of link speed */
 #define MAX_VLAN_ID            4095
 #define MIN_VLAN_ID            2
-#define MAX_TX_QUEUES          1
-#define MAX_RX_QUEUES          4
 #define DEFAULT_MAC_LEARN      1
 
 #define IS_VALID_VLAN(vlan)    (vlan >= MIN_VLAN_ID && vlan < MAX_VLAN_ID)
 #define IS_VALID_BW(bw)                (bw <= MAX_BW)
-#define IS_VALID_TX_QUEUES(que)        (que > 0 && que <= MAX_TX_QUEUES)
-#define IS_VALID_RX_QUEUES(que)        (que > 0 && que <= MAX_RX_QUEUES)
 
 struct qlcnic_pci_func_cfg {
        u16     func_type;
index 4994b947fd21720a476f7322a74a78014d2ec64f..cd88c7e1bfa9c76c3ae156da021a020f27346be5 100644 (file)
@@ -3653,10 +3653,8 @@ validate_npar_config(struct qlcnic_adapter *adapter,
                if (adapter->npars[pci_func].type != QLCNIC_TYPE_NIC)
                        return QL_STATUS_INVALID_PARAM;
 
-               if (!IS_VALID_BW(np_cfg[i].min_bw)
-                               || !IS_VALID_BW(np_cfg[i].max_bw)
-                               || !IS_VALID_RX_QUEUES(np_cfg[i].max_rx_queues)
-                               || !IS_VALID_TX_QUEUES(np_cfg[i].max_tx_queues))
+               if (!IS_VALID_BW(np_cfg[i].min_bw) ||
+                   !IS_VALID_BW(np_cfg[i].max_bw))
                        return QL_STATUS_INVALID_PARAM;
        }
        return 0;