diff options
| author |   Ron Mercer <ron.mercer@qlogic.com> | 2009-07-02 06:06:12 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-07-03 19:10:46 -0700 |
| commit | 6a47330892e697ae27d2d56a3c4c7fec2015be93 (patch) | |
| tree | 18dacc2ae53a0ee2250bacd1c35a4623d898f2bf /drivers/net/qlge/qlge_mpi.c | |
| parent | qlge: Fix MAC address bonding issue. (diff) | |
| download | linux-dev-6a47330892e697ae27d2d56a3c4c7fec2015be93.tar.xz linux-dev-6a47330892e697ae27d2d56a3c4c7fec2015be93.zip | |
qlge: Add/use function for link up/down.
We need to set/clear the mac address register when the link goes up/down
respectively. Without this both ports of a 2-port device can end up
with the same mac address in a bonding scenario.
The new ql_link_on() and ql_link_off() will also be used in handling
certain firmware events.
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/qlge/qlge_mpi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c index 71afbf8b9c50..6685bd97da91 100644 --- a/drivers/net/qlge/qlge_mpi.c +++ b/drivers/net/qlge/qlge_mpi.c @@ -238,7 +238,7 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp) &qdev->mpi_port_cfg_work, 0); } - netif_carrier_on(qdev->ndev); + ql_link_on(qdev); } static void ql_link_down(struct ql_adapter *qdev, struct mbox_params *mbcp) @@ -251,7 +251,7 @@ static void ql_link_down(struct ql_adapter *qdev, struct mbox_params *mbcp) if (status) QPRINTK(qdev, DRV, ERR, "Link down AEN broken!\n"); - netif_carrier_off(qdev->ndev); + ql_link_off(qdev); } static int ql_sfp_in(struct ql_adapter *qdev, struct mbox_params *mbcp) @@ -849,7 +849,7 @@ void ql_mpi_idc_work(struct work_struct *work) case MB_CMD_PORT_RESET: case MB_CMD_SET_PORT_CFG: case MB_CMD_STOP_FW: - netif_carrier_off(qdev->ndev); + ql_link_off(qdev); /* Signal the resulting link up AEN * that the frame routing and mac addr * needs to be set. |