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

Commit 03746bad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [8021Q]: vlan_ioctl_handler: fix return value
  [GENETLINK]: Correctly report errors while registering a multicast group
  [GENETLINK]: Fix adjustment of number of multicast groups
  [GENETLINK]: Fix race in genl_unregister_mc_groups()
  [NETFILTER]: Clean up duplicate includes in net/netfilter/
  [NETFILTER]: Clean up duplicate includes in net/bridge/
  [NETFILTER]: Fix logging regression
  [TCPv6] MD5SIG: Ensure to reset allocation count to avoid panic.
parents 719be629 3f5f4346

net/8021q/vlan.c

+2 −0
Original line number Diff line number Diff line
@@ -810,6 +810,7 @@ static int vlan_ioctl_handler(void __user *arg) 
		err = -EINVAL;

		break;

	case GET_VLAN_REALDEV_NAME_CMD:

		err = 0;

		vlan_dev_get_realdev_name(dev, args.u.device2);

		if (copy_to_user(arg, &args,

				 sizeof(struct vlan_ioctl_args))) {
@@ -818,6 +819,7 @@ static int vlan_ioctl_handler(void __user *arg) 
		break;



	case GET_VLAN_VID_CMD:

		err = 0;

		vlan_dev_get_vid(dev, &vid);

		args.u.VID = vid;

		if (copy_to_user(arg, &args,

net/bridge/netfilter/ebt_log.c

+2 −5
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 *

 */



#include <linux/in.h>

#include <linux/netfilter_bridge/ebtables.h>

#include <linux/netfilter_bridge/ebt_log.h>

#include <linux/netfilter.h>
@@ -196,10 +195,8 @@ static int __init ebt_log_init(void) 
	ret = ebt_register_watcher(&log);

	if (ret < 0)

		return ret;

	ret = nf_log_register(PF_BRIDGE, &ebt_log_logger);

	if (ret < 0 && ret != -EEXIST)

		ebt_unregister_watcher(&log);

	return ret;

	nf_log_register(PF_BRIDGE, &ebt_log_logger);

	return 0;

}



static void __exit ebt_log_fini(void)

net/bridge/netfilter/ebt_ulog.c

+2 −7
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <linux/timer.h>

#include <linux/netlink.h>

#include <linux/netdevice.h>

#include <linux/module.h>

#include <linux/netfilter_bridge/ebtables.h>

#include <linux/netfilter_bridge/ebt_ulog.h>

#include <net/sock.h>
@@ -308,12 +307,8 @@ static int __init ebt_ulog_init(void) 
	else if ((ret = ebt_register_watcher(&ulog)))

		sock_release(ebtulognl->sk_socket);



	if (nf_log_register(PF_BRIDGE, &ebt_ulog_logger) < 0) {

		printk(KERN_WARNING "ebt_ulog: not logging via ulog "

		       "since somebody else already registered for PF_BRIDGE\n");

		/* we cannot make module load fail here, since otherwise

		 * ebtables userspace would abort */

	}

	if (ret == 0)

		nf_log_register(PF_BRIDGE, &ebt_ulog_logger);



	return ret;

}

net/ipv4/netfilter/ipt_LOG.c

+2 −4
Original line number Diff line number Diff line
@@ -479,10 +479,8 @@ static int __init ipt_log_init(void) 
	ret = xt_register_target(&ipt_log_reg);

	if (ret < 0)

		return ret;

	ret = nf_log_register(PF_INET, &ipt_log_logger);

	if (ret < 0 && ret != -EEXIST)

		xt_unregister_target(&ipt_log_reg);

	return ret;

	nf_log_register(PF_INET, &ipt_log_logger);

	return 0;

}



static void __exit ipt_log_fini(void)

net/ipv6/netfilter/ip6t_LOG.c

+2 −4
Original line number Diff line number Diff line
@@ -493,10 +493,8 @@ static int __init ip6t_log_init(void) 
	ret = xt_register_target(&ip6t_log_reg);

	if (ret < 0)

		return ret;

	ret = nf_log_register(PF_INET6, &ip6t_logger);

	if (ret < 0 && ret != -EEXIST)

		xt_unregister_target(&ip6t_log_reg);

	return ret;

	nf_log_register(PF_INET6, &ip6t_logger);

	return 0;

}



static void __exit ip6t_log_fini(void)