Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents d252a5e7 379b026e

drivers/net/ne2k-pci.c

+3 −4
Original line number Diff line number Diff line
@@ -374,18 +374,17 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, 
	dev->ethtool_ops = &ne2k_pci_ethtool_ops;

	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);

	if (i)

		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",

	       dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq,

	       dev->dev_addr);



	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);



	return 0;



err_out_free_netdev:

net/atm/br2684.c

+1 −0
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ static void br2684_setup(struct net_device *netdev) 
	struct br2684_dev *brdev = BRPRIV(netdev);



	ether_setup(netdev);

	brdev->net_dev = netdev;



	netdev->netdev_ops = &br2684_netdev_ops;

net/sched/cls_api.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg) 
		}

		tp->ops = tp_ops;

		tp->protocol = protocol;

		tp->prio = nprio ? : tcf_auto_prio(*back);

		tp->prio = nprio ? : TC_H_MAJ(tcf_auto_prio(*back));

		tp->q = q;

		tp->classify = tp_ops->classify;

		tp->classid = parent;