ip6mr: Indentation not proper in ip6mr_cache_report()

ip6mr: Indentation not proper in ip6mr_cache_report()

[Ujjal Roy]

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

Hi All,

Before sending the patch, I am writing this email to get your
attention please. As per my knowledge I can see ip6mr_cache_report()
has some indentation issues. Please have a look at the line 1085.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/net/ipv6/ip6mr.c#n1085

Sharing a patch based on the latest stable Linux.

Thanks,
UjjaL Roy

[-- Attachment #2: ip6mr-ip6mr_cache_report-indent-fix.patch --]
[-- Type: application/octet-stream, Size: 1462 bytes --]

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 36ed9efb8825..aa5b884a819e 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -1082,30 +1082,26 @@ static int ip6mr_cache_report(struct mr_table *mrt, struct sk_buff *pkt,
 	} else
 #endif
 	{
-	/*
-	 *	Copy the IP header
-	 */
+		/* Copy the IP header */
+		skb_put(skb, sizeof(struct ipv6hdr));
+		skb_reset_network_header(skb);
+		skb_copy_to_linear_data(skb, ipv6_hdr(pkt),
+					sizeof(struct ipv6hdr));
+
+		/* Add our header */
+		skb_put(skb, sizeof(*msg));
+		skb_reset_transport_header(skb);
+		msg = (struct mrt6msg *)skb_transport_header(skb);
 
-	skb_put(skb, sizeof(struct ipv6hdr));
-	skb_reset_network_header(skb);
-	skb_copy_to_linear_data(skb, ipv6_hdr(pkt), sizeof(struct ipv6hdr));
+		msg->im6_mbz = 0;
+		msg->im6_msgtype = assert;
+		msg->im6_mif = mifi;
+		msg->im6_pad = 0;
+		msg->im6_src = ipv6_hdr(pkt)->saddr;
+		msg->im6_dst = ipv6_hdr(pkt)->daddr;
 
-	/*
-	 *	Add our header
-	 */
-	skb_put(skb, sizeof(*msg));
-	skb_reset_transport_header(skb);
-	msg = (struct mrt6msg *)skb_transport_header(skb);
-
-	msg->im6_mbz = 0;
-	msg->im6_msgtype = assert;
-	msg->im6_mif = mifi;
-	msg->im6_pad = 0;
-	msg->im6_src = ipv6_hdr(pkt)->saddr;
-	msg->im6_dst = ipv6_hdr(pkt)->daddr;
-
-	skb_dst_set(skb, dst_clone(skb_dst(pkt)));
-	skb->ip_summed = CHECKSUM_UNNECESSARY;
+		skb_dst_set(skb, dst_clone(skb_dst(pkt)));
+		skb->ip_summed = CHECKSUM_UNNECESSARY;
 	}
 
 	rcu_read_lock();

Re: ip6mr: Indentation not proper in ip6mr_cache_report()

[Jakub Kicinski]

On Wed, 8 Sep 2021 07:55:45 +0530 Ujjal Roy wrote:
> Hi All,
> 
> Before sending the patch, I am writing this email to get your
> attention please. As per my knowledge I can see ip6mr_cache_report()
> has some indentation issues. Please have a look at the line 1085.
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/net/ipv6/ip6mr.c#n1085
> 
> Sharing a patch based on the latest stable Linux.

Please repost with the patch being inline in the email.

Try to use git format-patch and git send-email for best results.

The subject prefix should be [PATCH net-next].

Regarding the change itself - since you're changing this code could you
also remove the ifdef? Instead of:

#ifdef CONFIG_IPV6_PIMSM_V2                                                     
        if (assert == MRT6MSG_WHOLEPKT) { 

do:

	if (IS_ENABLED(CONFIG_IPV6_PIMSM_V2) && assert == MRT6MSG_WHOLEPKT) {

Re: ip6mr: Indentation not proper in ip6mr_cache_report()

[Ujjal Roy]

Thanks for the suggestion, I will do that change and will submit a patch.

Thanks,
UjjaL Roy

On Wed, Sep 8, 2021 at 10:03 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Wed, 8 Sep 2021 07:55:45 +0530 Ujjal Roy wrote:
> > Hi All,
> >
> > Before sending the patch, I am writing this email to get your
> > attention please. As per my knowledge I can see ip6mr_cache_report()
> > has some indentation issues. Please have a look at the line 1085.
> > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/net/ipv6/ip6mr.c#n1085
> >
> > Sharing a patch based on the latest stable Linux.
>
> Please repost with the patch being inline in the email.
>
> Try to use git format-patch and git send-email for best results.
>
> The subject prefix should be [PATCH net-next].
>
> Regarding the change itself - since you're changing this code could you
> also remove the ifdef? Instead of:
>
> #ifdef CONFIG_IPV6_PIMSM_V2
>         if (assert == MRT6MSG_WHOLEPKT) {
>
> do:
>
>         if (IS_ENABLED(CONFIG_IPV6_PIMSM_V2) && assert == MRT6MSG_WHOLEPKT) {