diff options
author | Dimitris Michailidis <dm@chelsio.com> | 2010-06-18 06:05:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-19 01:08:38 -0400 |
commit | a0881cab6c0a1c8ad48a4ab0b971c8e786dadf1c (patch) | |
tree | 88e650f83b9a02946fd4298afbc47e5c35aff060 /drivers/net/cxgb4/t4_hw.c | |
parent | 91e9a1ec91243391e6f8f24ff4c5fbd4dfd67292 (diff) |
cxgb4: update FW definitions
Update to latest FW API. Most changes here pertain to port types and
querying FW for parameter values.
Signed-off-by: Dimitris Michailidis <dm@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb4/t4_hw.c')
-rw-r--r-- | drivers/net/cxgb4/t4_hw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c index 5c058ea36cd9..d92129b6c140 100644 --- a/drivers/net/cxgb4/t4_hw.c +++ b/drivers/net/cxgb4/t4_hw.c | |||
@@ -2580,7 +2580,7 @@ int t4_alloc_vi(struct adapter *adap, unsigned int mbox, unsigned int port, | |||
2580 | } | 2580 | } |
2581 | if (rss_size) | 2581 | if (rss_size) |
2582 | *rss_size = FW_VI_CMD_RSSSIZE_GET(ntohs(c.rsssize_pkd)); | 2582 | *rss_size = FW_VI_CMD_RSSSIZE_GET(ntohs(c.rsssize_pkd)); |
2583 | return ntohs(c.viid_pkd); | 2583 | return FW_VI_CMD_VIID_GET(ntohs(c.type_viid)); |
2584 | } | 2584 | } |
2585 | 2585 | ||
2586 | /** | 2586 | /** |
@@ -2603,7 +2603,7 @@ int t4_free_vi(struct adapter *adap, unsigned int mbox, unsigned int pf, | |||
2603 | FW_CMD_EXEC | FW_VI_CMD_PFN(pf) | | 2603 | FW_CMD_EXEC | FW_VI_CMD_PFN(pf) | |
2604 | FW_VI_CMD_VFN(vf)); | 2604 | FW_VI_CMD_VFN(vf)); |
2605 | c.alloc_to_len16 = htonl(FW_VI_CMD_FREE | FW_LEN16(c)); | 2605 | c.alloc_to_len16 = htonl(FW_VI_CMD_FREE | FW_LEN16(c)); |
2606 | c.viid_pkd = htons(FW_VI_CMD_VIID(viid)); | 2606 | c.type_viid = htons(FW_VI_CMD_VIID(viid)); |
2607 | return t4_wr_mbox(adap, mbox, &c, sizeof(c), &c); | 2607 | return t4_wr_mbox(adap, mbox, &c, sizeof(c), &c); |
2608 | } | 2608 | } |
2609 | 2609 | ||
@@ -3169,7 +3169,7 @@ int __devinit t4_port_init(struct adapter *adap, int mbox, int pf, int vf) | |||
3169 | p->mdio_addr = (ret & FW_PORT_CMD_MDIOCAP) ? | 3169 | p->mdio_addr = (ret & FW_PORT_CMD_MDIOCAP) ? |
3170 | FW_PORT_CMD_MDIOADDR_GET(ret) : -1; | 3170 | FW_PORT_CMD_MDIOADDR_GET(ret) : -1; |
3171 | p->port_type = FW_PORT_CMD_PTYPE_GET(ret); | 3171 | p->port_type = FW_PORT_CMD_PTYPE_GET(ret); |
3172 | p->mod_type = FW_PORT_CMD_MODTYPE_GET(ret); | 3172 | p->mod_type = FW_PORT_MOD_TYPE_NA; |
3173 | 3173 | ||
3174 | init_link_config(&p->link_cfg, ntohs(c.u.info.pcap)); | 3174 | init_link_config(&p->link_cfg, ntohs(c.u.info.pcap)); |
3175 | j++; | 3175 | j++; |