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

Commit ff3ea47c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [BRIDGE]: fix locking and memory leak in br_add_bridge
  [IRDA]: Missing allocation result check in irlap_change_speed().
  [PPPOE]: Missing result check in __pppoe_xmit().
  [NET]: Eliminate unused /proc/sys/net/ethernet
  [NETCONSOLE]: Clean up initcall warning.
  [TCP]: Avoid skb_pull if possible when trimming head
parents a8c72504 36485707

drivers/net/netconsole.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int init_netconsole(void) 


	if(!configured) {

		printk("netconsole: not configured, aborting\n");

		return -EINVAL;

		return 0;

	}



	if(netpoll_setup(&np))

drivers/net/pppoe.c

+3 −0
Original line number Diff line number Diff line
@@ -861,6 +861,9 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) 
		 * give dev_queue_xmit something it can free.

		 */

		skb2 = skb_clone(skb, GFP_ATOMIC);



		if (skb2 == NULL)

			goto abort;

	}



	ph = (struct pppoe_hdr *) skb_push(skb2, sizeof(struct pppoe_hdr));

net/bridge/br_if.c

+7 −12
Original line number Diff line number Diff line
@@ -300,25 +300,20 @@ int br_add_bridge(const char *name) 
	rtnl_lock();

	if (strchr(dev->name, '%')) {

		ret = dev_alloc_name(dev, dev->name);

		if (ret < 0)

			goto err1;

		if (ret < 0) {

			free_netdev(dev);

			goto out;

		}

	}



	ret = register_netdevice(dev);

	if (ret)

		goto err2;

		goto out;



	ret = br_sysfs_addbr(dev);

	if (ret)

		goto err3;

	rtnl_unlock();

	return 0;



 err3:

	unregister_netdev(dev);

 err2:

	free_netdev(dev);

 err1:

		unregister_netdevice(dev);

 out:

	rtnl_unlock();

	return ret;

}

net/ethernet/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,6 +3,5 @@ 
#



obj-y					+= eth.o

obj-$(CONFIG_SYSCTL)			+= sysctl_net_ether.o

obj-$(subst m,y,$(CONFIG_IPX))		+= pe2.o

obj-$(subst m,y,$(CONFIG_ATALK))	+= pe2.o

net/ethernet/sysctl_net_ether.c

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/* -*- linux-c -*-

 * sysctl_net_ether.c: sysctl interface to net Ethernet subsystem.

 *

 * Begun April 1, 1996, Mike Shaver.

 * Added /proc/sys/net/ether directory entry (empty =) ). [MS]

 */



#include <linux/mm.h>

#include <linux/sysctl.h>

#include <linux/if_ether.h>



ctl_table ether_table[] = {

	{0}

};