diff options
Diffstat (limited to 'drivers/net/enic/enic_res.c')
-rw-r--r-- | drivers/net/enic/enic_res.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c index 29ede8a17a2c..6e5c6356e7df 100644 --- a/drivers/net/enic/enic_res.c +++ b/drivers/net/enic/enic_res.c | |||
@@ -94,13 +94,14 @@ int enic_get_vnic_config(struct enic *enic) | |||
94 | INTR_COALESCE_HW_TO_USEC(VNIC_INTR_TIMER_MAX), | 94 | INTR_COALESCE_HW_TO_USEC(VNIC_INTR_TIMER_MAX), |
95 | c->intr_timer_usec); | 95 | c->intr_timer_usec); |
96 | 96 | ||
97 | dev_info(enic_get_dev(enic), "vNIC MAC addr %pM wq/rq %d/%d\n", | 97 | dev_info(enic_get_dev(enic), |
98 | enic->mac_addr, c->wq_desc_count, c->rq_desc_count); | 98 | "vNIC MAC addr %pM wq/rq %d/%d mtu %d\n", |
99 | dev_info(enic_get_dev(enic), "vNIC mtu %d csum tx/rx %d/%d " | 99 | enic->mac_addr, c->wq_desc_count, c->rq_desc_count, c->mtu); |
100 | "tso/lro %d/%d intr timer %d usec\n", | 100 | dev_info(enic_get_dev(enic), "vNIC csum tx/rx %d/%d " |
101 | c->mtu, ENIC_SETTING(enic, TXCSUM), | 101 | "tso %d intr timer %d usec rss %d\n", |
102 | ENIC_SETTING(enic, RXCSUM), ENIC_SETTING(enic, TSO), | 102 | ENIC_SETTING(enic, TXCSUM), ENIC_SETTING(enic, RXCSUM), |
103 | ENIC_SETTING(enic, LRO), c->intr_timer_usec); | 103 | ENIC_SETTING(enic, TSO), |
104 | c->intr_timer_usec, ENIC_SETTING(enic, RSS)); | ||
104 | 105 | ||
105 | return 0; | 106 | return 0; |
106 | } | 107 | } |
@@ -181,18 +182,11 @@ void enic_free_vnic_resources(struct enic *enic) | |||
181 | 182 | ||
182 | void enic_get_res_counts(struct enic *enic) | 183 | void enic_get_res_counts(struct enic *enic) |
183 | { | 184 | { |
184 | enic->wq_count = min_t(int, | 185 | enic->wq_count = vnic_dev_get_res_count(enic->vdev, RES_TYPE_WQ); |
185 | vnic_dev_get_res_count(enic->vdev, RES_TYPE_WQ), | 186 | enic->rq_count = vnic_dev_get_res_count(enic->vdev, RES_TYPE_RQ); |
186 | ENIC_WQ_MAX); | 187 | enic->cq_count = vnic_dev_get_res_count(enic->vdev, RES_TYPE_CQ); |
187 | enic->rq_count = min_t(int, | 188 | enic->intr_count = vnic_dev_get_res_count(enic->vdev, |
188 | vnic_dev_get_res_count(enic->vdev, RES_TYPE_RQ), | 189 | RES_TYPE_INTR_CTRL); |
189 | ENIC_RQ_MAX); | ||
190 | enic->cq_count = min_t(int, | ||
191 | vnic_dev_get_res_count(enic->vdev, RES_TYPE_CQ), | ||
192 | ENIC_CQ_MAX); | ||
193 | enic->intr_count = min_t(int, | ||
194 | vnic_dev_get_res_count(enic->vdev, RES_TYPE_INTR_CTRL), | ||
195 | ENIC_INTR_MAX); | ||
196 | 190 | ||
197 | dev_info(enic_get_dev(enic), | 191 | dev_info(enic_get_dev(enic), |
198 | "vNIC resources avail: wq %d rq %d cq %d intr %d\n", | 192 | "vNIC resources avail: wq %d rq %d cq %d intr %d\n", |