From 637417dcb412d82bee71a46a9998e30d50654dee Mon Sep 17 00:00:00 2001 From: Rajesh Borundia Date: Tue, 2 Apr 2013 05:34:42 +0000 Subject: [PATCH] --- yaml --- r: 368813 b: refs/heads/master c: 0c453de6d53b5aabfee817abf0f69e9534c751c1 h: refs/heads/master i: 368811: 185954a75ce1b1f30b374cae77284f35247c39e1 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a144a5accc70..f2f511a6b08c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1a094a83059b4677038befde6c4da6cfed31dbd +refs/heads/master: 0c453de6d53b5aabfee817abf0f69e9534c751c1 diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c index d6ac7dcef1e4..bed505606a2d 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c +++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c @@ -156,6 +156,7 @@ static int qlcnic_sriov_get_pf_info(struct qlcnic_adapter *adapter, npar_info->max_local_ipv6_addrs = LSW(cmd.rsp.arg[8]); npar_info->max_remote_ipv6_addrs = MSW(cmd.rsp.arg[8]); + qlcnic_sriov_pf_set_ff_max_res(adapter, npar_info); dev_info(&adapter->pdev->dev, "\n\ttotal_pf: %d,\n" "\n\ttotal_rss_engines: %d max_vports: %d max_tx_ques %d,\n" @@ -376,8 +377,6 @@ static int qlcnic_sriov_pf_init(struct qlcnic_adapter *adapter) if (err) goto delete_vport; - qlcnic_sriov_pf_set_ff_max_res(adapter, &pf_info); - err = qlcnic_get_nic_info(adapter, &nic_info, func); if (err) goto delete_vport;