net/ncsi: Don't probe on the reserved channel ID (0x1f)

We needn't send CIS (Clear Initial State) command to the NCSI
reserved channel (0x1f) in the enumeration. We shouldn't receive
a valid response from CIS on NCSI channel 0x1f.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c
index 97c99be..8c5e016 100644 (file)
--- a/net/ncsi/ncsi-manage.c
+++ b/net/ncsi/ncsi-manage.c
@@ -911,12 +911,12 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp)
                nd->state = ncsi_dev_state_probe_cis;
                break;
        case ncsi_dev_state_probe_cis:
                nd->state = ncsi_dev_state_probe_cis;
                break;
        case ncsi_dev_state_probe_cis:

-               ndp->pending_req_num = 32;
+               ndp->pending_req_num = NCSI_RESERVED_CHANNEL;

 
                /* Clear initial state */
                nca.type = NCSI_PKT_CMD_CIS;
                nca.package = ndp->active_package->id;
 
                /* Clear initial state */
                nca.type = NCSI_PKT_CMD_CIS;
                nca.package = ndp->active_package->id;

-               for (index = 0; index < 0x20; index++) {
+               for (index = 0; index < NCSI_RESERVED_CHANNEL; index++) {

                        nca.channel = index;
                        ret = ncsi_xmit_cmd(&nca);
                        if (ret)
                        nca.channel = index;
                        ret = ncsi_xmit_cmd(&nca);
                        if (ret)