2022-07-14 16:25:11

by Maksym Glubokiy

[permalink] [raw]
Subject: [PATCH net-next] net: prestera: acl: fix code formatting

Make the code look better.

Signed-off-by: Maksym Glubokiy <[email protected]>
---
.../net/ethernet/marvell/prestera/prestera_flower.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flower.c b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
index 92c6ace125e0..464f361b5fd9 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_flower.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0
-/* Copyright (c) 2020 Marvell International Ltd. All rights reserved */
+/* Copyright (c) 2020-2022 Marvell International Ltd. All rights reserved */

#include "prestera.h"
#include "prestera_acl.h"
@@ -138,7 +138,8 @@ static int prestera_flower_parse_actions(struct prestera_flow_block *block,
static int prestera_flower_parse_meta(struct prestera_acl_rule *rule,
struct flow_cls_offload *f,
struct prestera_flow_block *block)
-{ struct flow_rule *f_rule = flow_cls_offload_flow_rule(f);
+{
+ struct flow_rule *f_rule = flow_cls_offload_flow_rule(f);
struct prestera_acl_match *r_match = &rule->re_key.match;
struct prestera_port *port;
struct net_device *ingress_dev;
@@ -178,13 +179,13 @@ static int prestera_flower_parse_meta(struct prestera_acl_rule *rule,
rule_match_set(r_match->mask, SYS_DEV, mask);

return 0;
-
}

static int prestera_flower_parse(struct prestera_flow_block *block,
struct prestera_acl_rule *rule,
struct flow_cls_offload *f)
-{ struct flow_rule *f_rule = flow_cls_offload_flow_rule(f);
+{
+ struct flow_rule *f_rule = flow_cls_offload_flow_rule(f);
struct flow_dissector *dissector = f_rule->match.dissector;
struct prestera_acl_match *r_match = &rule->re_key.match;
__be16 n_proto_mask = 0;
@@ -421,7 +422,6 @@ void prestera_flower_destroy(struct prestera_flow_block *block,
prestera_acl_rule_destroy(rule);
}
prestera_acl_ruleset_put(ruleset);
-
}

int prestera_flower_tmplt_create(struct prestera_flow_block *block,
--
2.25.1


2022-07-14 17:01:33

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH net-next] net: prestera: acl: fix code formatting

On Thu, 2022-07-14 at 19:17 +0300, Maksym Glubokiy wrote:
> Make the code look better.
>
> Signed-off-by: Maksym Glubokiy <[email protected]>
> ---
> .../net/ethernet/marvell/prestera/prestera_flower.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flower.c b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
[]
> @@ -1,5 +1,5 @@
> // SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0
> -/* Copyright (c) 2020 Marvell International Ltd. All rights reserved */
> +/* Copyright (c) 2020-2022 Marvell International Ltd. All rights reserved */

What gives you the right to extend Marvell's copyright?

In general, don't change copyright for whitespace changes
and unless you are the copyright owner.

2022-07-14 18:25:49

by Maksym Glubokiy

[permalink] [raw]
Subject: Re: [PATCH net-next] net: prestera: acl: fix code formatting

On Thu, Jul 14, 2022 at 09:27:52AM -0700, Joe Perches wrote:
> On Thu, 2022-07-14 at 19:17 +0300, Maksym Glubokiy wrote:
> > Make the code look better.
> >
> > Signed-off-by: Maksym Glubokiy <[email protected]>
> > ---
> > .../net/ethernet/marvell/prestera/prestera_flower.c | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flower.c b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
> []
> > @@ -1,5 +1,5 @@
> > // SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0
> > -/* Copyright (c) 2020 Marvell International Ltd. All rights reserved */
> > +/* Copyright (c) 2020-2022 Marvell International Ltd. All rights reserved */
>
> What gives you the right to extend Marvell's copyright?
>
> In general, don't change copyright for whitespace changes
> and unless you are the copyright owner.
>
Ack. I'll remove the change to the copyright in v2.