diff options
Diffstat (limited to 'drivers/staging/qlge/qlge_main.c')
| -rw-r--r-- | drivers/staging/qlge/qlge_main.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c index c9dc6a852af4..19a02e958865 100644 --- a/drivers/staging/qlge/qlge_main.c +++ b/drivers/staging/qlge/qlge_main.c @@ -1389,7 +1389,7 @@ static void qlge_categorize_rx_err(struct qlge_adapter *qdev, u8 rx_err, } } -/** +/* * qlge_update_mac_hdr_len - helper routine to update the mac header length * based on vlan tags if present */ @@ -2235,7 +2235,7 @@ static void qlge_vlan_mode(struct net_device *ndev, netdev_features_t features) } } -/** +/* * qlge_update_hw_vlan_features - helper routine to reinitialize the adapter * based on the features to enable/disable hardware vlan accel */ @@ -2796,12 +2796,8 @@ static int qlge_init_bq(struct qlge_bq *bq) bq->base = dma_alloc_coherent(&qdev->pdev->dev, QLGE_BQ_SIZE, &bq->base_dma, GFP_ATOMIC); - if (!bq->base) { - netif_err(qdev, ifup, qdev->ndev, - "ring %u %s allocation failed.\n", rx_ring->cq_id, - bq_type_name[bq->type]); + if (!bq->base) return -ENOMEM; - } bq->queue = kmalloc_array(QLGE_BQ_LEN, sizeof(struct qlge_bq_desc), GFP_KERNEL); |