ethernet: Remove unnecessary alloc/OOM messages, alloc cleanups

[mirror_ubuntu-zesty-kernel.git] / drivers / net / ethernet / qlogic / qlge / qlge_main.c

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index f80cd975daed2b84a31af47db58b828d28139638..325627e287fc7d91d4074cdcc6b9a3c1644b68b3 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -4572,7 +4572,6 @@ static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev,
                qdev->mpi_coredump =
                        vmalloc(sizeof(struct ql_mpi_coredump));
                if (qdev->mpi_coredump == NULL) {
-                       dev_err(&pdev->dev, "Coredump alloc failed.\n");
                        err = -ENOMEM;
                        goto err_out2;
                }
@@ -4586,7 +4585,6 @@ static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev,
                goto err_out2;
        }
 
-       memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len);
        /* Keep local copy of current mac address. */
        memcpy(qdev->current_mac_addr, ndev->dev_addr, ndev->addr_len);
 
@@ -4678,7 +4676,7 @@ static int qlge_probe(struct pci_dev *pdev,
        qdev = netdev_priv(ndev);
        SET_NETDEV_DEV(ndev, &pdev->dev);
        ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM |
-               NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN |
+               NETIF_F_TSO | NETIF_F_TSO_ECN |
                NETIF_F_HW_VLAN_TX | NETIF_F_RXCSUM;
        ndev->features = ndev->hw_features |
                NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;