Commit f157c416 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Steffen Klassert
Browse files

xfrm: a few coding style clean ups 



Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent cc2bbbfd

net/xfrm/xfrm_policy.c

+6 −3
Original line number Diff line number Diff line
@@ -4414,7 +4414,8 @@ int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, 
	struct xfrm_migrate *mp;



	/* Stage 0 - sanity checks */

	if ((err = xfrm_migrate_check(m, num_migrate)) < 0)

	err = xfrm_migrate_check(m, num_migrate);

	if (err < 0)

		goto out;



	if (dir >= XFRM_POLICY_MAX) {
@@ -4423,7 +4424,8 @@ int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, 
	}



	/* Stage 1 - find policy */

	if ((pol = xfrm_migrate_policy_find(sel, dir, type, net, if_id)) == NULL) {

	pol = xfrm_migrate_policy_find(sel, dir, type, net, if_id);

	if (!pol) {

		err = -ENOENT;

		goto out;

	}
@@ -4445,7 +4447,8 @@ int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, 
	}



	/* Stage 3 - update policy */

	if ((err = xfrm_policy_migrate(pol, m, num_migrate)) < 0)

	err = xfrm_policy_migrate(pol, m, num_migrate);

	if (err < 0)

		goto restore_state;



	/* Stage 4 - delete old state(s) */

net/xfrm/xfrm_user.c

+3 −3
Original line number Diff line number Diff line
@@ -1538,7 +1538,7 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh, 
				  &p->info.saddr, 1,

				  family);

	err = -ENOENT;

	if (x == NULL)

	if (!x)

		goto out_noput;



	err = xfrm_alloc_spi(x, p->min, p->max);
@@ -2718,7 +2718,7 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh, 
	struct xfrm_encap_tmpl  *encap = NULL;

	u32 if_id = 0;



	if (attrs[XFRMA_MIGRATE] == NULL)

	if (!attrs[XFRMA_MIGRATE])

		return -EINVAL;



	kmp = attrs[XFRMA_KMADDRESS] ? &km : NULL;
@@ -2727,7 +2727,7 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh, 
	if (err)

		return err;



	err = copy_from_user_migrate((struct xfrm_migrate *)m, kmp, attrs, &n);

	err = copy_from_user_migrate(m, kmp, attrs, &n);

	if (err)

		return err;