ixgb: use PCI_VENDOR_ID_INTEL

[deliverable/linux.git] / drivers / net / ethernet / lantiq_etop.c

diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 5dc9cbd5151417737c1779df53f102045da92595..003c5bc7189f7ef0138a46f96f10f64b52154d5c 100644 (file)
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -149,7 +149,6 @@ ltq_etop_hw_receive(struct ltq_etop_chan *ch)
        spin_unlock_irqrestore(&priv->lock, flags);
 
        skb_put(skb, len);
-       skb->dev = ch->netdev;
        skb->protocol = eth_type_trans(skb, ch->netdev);
        netif_receive_skb(skb);
 }
@@ -646,7 +645,7 @@ ltq_etop_init(struct net_device *dev)
        memcpy(&mac, &priv->pldata->mac, sizeof(struct sockaddr));
        if (!is_valid_ether_addr(mac.sa_data)) {
                pr_warn("etop: invalid MAC, using random\n");
-               random_ether_addr(mac.sa_data);
+               eth_random_addr(mac.sa_data);
                random_mac = true;
        }