From 3fb0c2e222e1083f73abdbe7648466b1b8b25d13 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Fri, 26 Oct 2012 05:30:31 +0000 Subject: [PATCH] --- yaml --- r: 340523 b: refs/heads/master c: 1627801def0e1cef948f9d593e6757eab295803f h: refs/heads/master i: 340521: 9e8e64474445d98c5b1b212841c27076e4f17b8c 340519: f2475d91cd40ddd67898b328cb31f45c6ab3e242 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qla3xxx.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 72850907c025..ff7921cd743d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 680d86699d17622bf2dd1bdd9f6d2520af1b142d +refs/heads/master: 1627801def0e1cef948f9d593e6757eab295803f diff --git a/trunk/drivers/net/ethernet/qlogic/qla3xxx.c b/trunk/drivers/net/ethernet/qlogic/qla3xxx.c index 3a17dcc3e910..80ba7292ec3d 100644 --- a/trunk/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/trunk/drivers/net/ethernet/qlogic/qla3xxx.c @@ -1920,7 +1920,6 @@ static void ql_process_mac_tx_intr(struct ql3_adapter *qdev, { struct ql_tx_buf_cb *tx_cb; int i; - int retval = 0; if (mac_rsp->flags & OB_MAC_IOCB_RSP_S) { netdev_warn(qdev->ndev, @@ -1935,7 +1934,6 @@ static void ql_process_mac_tx_intr(struct ql3_adapter *qdev, "Frame too short to be legal, frame not sent\n"); qdev->ndev->stats.tx_errors++; - retval = -EIO; goto frame_not_sent; } @@ -1944,7 +1942,6 @@ static void ql_process_mac_tx_intr(struct ql3_adapter *qdev, mac_rsp->transaction_id); qdev->ndev->stats.tx_errors++; - retval = -EIO; goto invalid_seg_count; }