netfilter: Add blank lines in callers of netfilter hooks

ebiederm · davem330 · commit be10de0a322d · 2015-09-17T17:18:37.000-07:00
In code review it was noticed that I had failed to add some blank lines
in places where they are customarily used.  Taking a second look at the
code I have to agree blank lines would be nice so I have added them
here.

Reported-by:  Nicolas Dichtel &lt;nicolas.dichtel@6wind.com&gt;
Signed-off-by: "Eric W. Biederman" &lt;ebiederm@xmission.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c
@@ -97,6 +97,7 @@ static int __xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb)
 int xfrm4_output(struct sock *sk, struct sk_buff *skb)
 {
 	struct net *net = dev_net(skb_dst(skb)->dev);
+
 	return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING,
 			    net, sk, skb, NULL, skb_dst(skb)->dev,
 			    __xfrm4_output,
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
@@ -136,6 +136,7 @@ int ip6_output(struct sock *sk, struct sk_buff *skb)
 	struct net_device *dev = skb_dst(skb)->dev;
 	struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
 	struct net *net = dev_net(dev);
+
 	if (unlikely(idev->cnf.disable_ipv6)) {
 		IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);
 		kfree_skb(skb);
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
@@ -169,6 +169,7 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
 int xfrm6_output(struct sock *sk, struct sk_buff *skb)
 {
 	struct net *net = dev_net(skb_dst(skb)->dev);
+
 	return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING,
 			    net, sk, skb,  NULL, skb_dst(skb)->dev,
 			    __xfrm6_output,
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
@@ -132,6 +132,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
 int xfrm_output_resume(struct sk_buff *skb, int err)
 {
 	struct net *net = xs_net(skb_dst(skb)->xfrm);
+
 	while (likely((err = xfrm_output_one(skb, err)) == 0)) {
 		nf_reset(skb);
 

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ static int __xfrm4_output(struct net net, struct sock sk, struct sk_buff *skb)`
`97`	`97`	`int xfrm4_output(struct sock sk, struct sk_buff skb)`
`98`	`98`	`{`
`99`	`99`	`struct net *net = dev_net(skb_dst(skb)->dev);`
	`100`	`+`
`100`	`101`	`return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING,`
`101`	`102`	`net, sk, skb, NULL, skb_dst(skb)->dev,`
`102`	`103`	`__xfrm4_output,`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ static int __xfrm6_output(struct net net, struct sock sk, struct sk_buff *skb)`
`169`	`169`	`int xfrm6_output(struct sock sk, struct sk_buff skb)`
`170`	`170`	`{`
`171`	`171`	`struct net *net = dev_net(skb_dst(skb)->dev);`
	`172`	`+`
`172`	`173`	`return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING,`
`173`	`174`	`net, sk, skb, NULL, skb_dst(skb)->dev,`
`174`	`175`	`__xfrm6_output,`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err)`
`132`	`132`	`int xfrm_output_resume(struct sk_buff *skb, int err)`
`133`	`133`	`{`
`134`	`134`	`struct net *net = xs_net(skb_dst(skb)->xfrm);`
	`135`	`+`
`135`	`136`	`while (likely((err = xfrm_output_one(skb, err)) == 0)) {`
`136`	`137`	`nf_reset(skb);`
`137`	`138`