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

Commit 52af2bfc authored Mar 07, 2014 by Pablo Neira Ayuso

Merge git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next



Via Simon Horman:

====================
* Whitespace cleanup spotted by checkpatch.pl from Tingwei Liu.
* Section conflict cleanup, basically removal of one wrong __read_mostly,
  from Andi Kleen.
====================

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parents 07cf8f5a 411fd527

net/netfilter/ipvs/ip_vs_ctl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3580,7 +3580,7 @@ static int ip_vs_genl_get_cmd(struct sk_buff skb, struct genl_info info)
		}


		static const struct genl_ops ip_vs_genl_ops[] __read_mostly = {
		static const struct genl_ops ip_vs_genl_ops[] = {
		{
		.cmd = IPVS_CMD_NEW_SERVICE,
		.flags = GENL_ADMIN_PERM,

net/netfilter/ipvs/ip_vs_lblc.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -536,8 +536,7 @@ ip_vs_lblc_schedule(struct ip_vs_service svc, const struct sk_buff skb,
		/*
		* IPVS LBLC Scheduler structure
		*/
		static struct ip_vs_scheduler ip_vs_lblc_scheduler =
		{
		static struct ip_vs_scheduler ip_vs_lblc_scheduler = {
		.name = "lblc",
		.refcnt = ATOMIC_INIT(0),
		.module = THIS_MODULE,