aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAjit Khaparde <ajit.khaparde@emulex.com>2011-04-19 08:11:46 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-19 23:13:10 -0400
commit187e87566d22b0d0e99b5ae7c6e18569ab5f6aee (patch)
treeee9330899174466eb9f45e515b6f282736524e12
parent6349935bdfa4a210fb557e7541caad1d41925ccc (diff)
be2net: pass domain id to be_cmd_link_status_query
Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/benet/be_cmds.c2
-rw-r--r--drivers/net/benet/be_cmds.h2
-rw-r--r--drivers/net/benet/be_ethtool.c4
-rw-r--r--drivers/net/benet/be_main.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index a94e98060c93..af8cf3d7c1e3 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1112,7 +1112,7 @@ err:
1112 1112
1113/* Uses synchronous mcc */ 1113/* Uses synchronous mcc */
1114int be_cmd_link_status_query(struct be_adapter *adapter, 1114int be_cmd_link_status_query(struct be_adapter *adapter,
1115 bool *link_up, u8 *mac_speed, u16 *link_speed) 1115 bool *link_up, u8 *mac_speed, u16 *link_speed, u32 dom)
1116{ 1116{
1117 struct be_mcc_wrb *wrb; 1117 struct be_mcc_wrb *wrb;
1118 struct be_cmd_req_link_status *req; 1118 struct be_cmd_req_link_status *req;
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index 3fb6e0a3ad7a..af4bbff5feba 100644
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -1112,7 +1112,7 @@ extern int be_cmd_rxq_create(struct be_adapter *adapter,
1112extern int be_cmd_q_destroy(struct be_adapter *adapter, struct be_queue_info *q, 1112extern int be_cmd_q_destroy(struct be_adapter *adapter, struct be_queue_info *q,
1113 int type); 1113 int type);
1114extern int be_cmd_link_status_query(struct be_adapter *adapter, 1114extern int be_cmd_link_status_query(struct be_adapter *adapter,
1115 bool *link_up, u8 *mac_speed, u16 *link_speed); 1115 bool *link_up, u8 *mac_speed, u16 *link_speed, u32 dom);
1116extern int be_cmd_reset(struct be_adapter *adapter); 1116extern int be_cmd_reset(struct be_adapter *adapter);
1117extern int be_cmd_get_stats(struct be_adapter *adapter, 1117extern int be_cmd_get_stats(struct be_adapter *adapter,
1118 struct be_dma_mem *nonemb_cmd); 1118 struct be_dma_mem *nonemb_cmd);
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 33c2beccaa8e..6565f3e55b26 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -376,7 +376,7 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
376 376
377 if ((adapter->link_speed < 0) || (!(netdev->flags & IFF_UP))) { 377 if ((adapter->link_speed < 0) || (!(netdev->flags & IFF_UP))) {
378 status = be_cmd_link_status_query(adapter, &link_up, 378 status = be_cmd_link_status_query(adapter, &link_up,
379 &mac_speed, &link_speed); 379 &mac_speed, &link_speed, 0);
380 380
381 be_link_status_update(adapter, link_up); 381 be_link_status_update(adapter, link_up);
382 /* link_speed is in units of 10 Mbps */ 382 /* link_speed is in units of 10 Mbps */
@@ -661,7 +661,7 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
661 } 661 }
662 662
663 if (be_cmd_link_status_query(adapter, &link_up, &mac_speed, 663 if (be_cmd_link_status_query(adapter, &link_up, &mac_speed,
664 &qos_link_speed) != 0) { 664 &qos_link_speed, 0) != 0) {
665 test->flags |= ETH_TEST_FL_FAILED; 665 test->flags |= ETH_TEST_FL_FAILED;
666 data[4] = -1; 666 data[4] = -1;
667 } else if (!mac_speed) { 667 } else if (!mac_speed) {
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 1bb763cda3ad..77a6e7e4593c 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -2171,7 +2171,7 @@ static int be_open(struct net_device *netdev)
2171 be_async_mcc_enable(adapter); 2171 be_async_mcc_enable(adapter);
2172 2172
2173 status = be_cmd_link_status_query(adapter, &link_up, &mac_speed, 2173 status = be_cmd_link_status_query(adapter, &link_up, &mac_speed,
2174 &link_speed); 2174 &link_speed, 0);
2175 if (status) 2175 if (status)
2176 goto err; 2176 goto err;
2177 be_link_status_update(adapter, link_up); 2177 be_link_status_update(adapter, link_up);