Commit 698960a0 authored by David S. Miller's avatar David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents d252a5e7 379b026e
...@@ -374,18 +374,17 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, ...@@ -374,18 +374,17 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
dev->ethtool_ops = &ne2k_pci_ethtool_ops; dev->ethtool_ops = &ne2k_pci_ethtool_ops;
NS8390_init(dev, 0); NS8390_init(dev, 0);
memcpy(dev->dev_addr, SA_prom, 6);
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
i = register_netdev(dev); i = register_netdev(dev);
if (i) if (i)
goto err_out_free_netdev; goto err_out_free_netdev;
for(i = 0; i < 6; i++)
dev->dev_addr[i] = SA_prom[i];
printk("%s: %s found at %#lx, IRQ %d, %pM.\n", printk("%s: %s found at %#lx, IRQ %d, %pM.\n",
dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq, dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq,
dev->dev_addr); dev->dev_addr);
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
return 0; return 0;
err_out_free_netdev: err_out_free_netdev:
......
...@@ -549,6 +549,7 @@ static void br2684_setup(struct net_device *netdev) ...@@ -549,6 +549,7 @@ static void br2684_setup(struct net_device *netdev)
struct br2684_dev *brdev = BRPRIV(netdev); struct br2684_dev *brdev = BRPRIV(netdev);
ether_setup(netdev); ether_setup(netdev);
brdev->net_dev = netdev;
netdev->netdev_ops = &br2684_netdev_ops; netdev->netdev_ops = &br2684_netdev_ops;
......
...@@ -254,7 +254,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg) ...@@ -254,7 +254,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
} }
tp->ops = tp_ops; tp->ops = tp_ops;
tp->protocol = protocol; tp->protocol = protocol;
tp->prio = nprio ? : tcf_auto_prio(*back); tp->prio = nprio ? : TC_H_MAJ(tcf_auto_prio(*back));
tp->q = q; tp->q = q;
tp->classify = tp_ops->classify; tp->classify = tp_ops->classify;
tp->classid = parent; tp->classid = parent;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment