| Message ID | 20230208005626.56847-1-yang.lee@linux.alibaba.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [-next] net: bridge: clean up one inconsistent indenting | expand |
On 2/8/23 02:56, Yang Li wrote: > ./net/bridge/br_netlink_tunnel.c:317:4-27: code aligned with following code on line 318 > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3977 > Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> > --- > net/bridge/br_netlink_tunnel.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c > index 17abf092f7ca..eff949bfdd83 100644 > --- a/net/bridge/br_netlink_tunnel.c > +++ b/net/bridge/br_netlink_tunnel.c > @@ -315,7 +315,7 @@ int br_process_vlan_tunnel_info(const struct net_bridge *br, > > if (curr_change) > *changed = curr_change; > - __vlan_tunnel_handle_range(p, &v_start, &v_end, v, > + __vlan_tunnel_handle_range(p, &v_start, &v_end, v, > curr_change); > } > if (v_start && v_end) Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
On Wed, Feb 08, 2023 at 08:56:26AM +0800, Yang Li wrote: > ./net/bridge/br_netlink_tunnel.c:317:4-27: code aligned with following code on line 318 > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3977 > Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> As you may need to respin this: Assuming this is targeting net-next, which seems likely to me, the subject should denote that. Something like this: [PATCH net-next] net: bridge: clean up one inconsistent indenting > --- > net/bridge/br_netlink_tunnel.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c > index 17abf092f7ca..eff949bfdd83 100644 > --- a/net/bridge/br_netlink_tunnel.c > +++ b/net/bridge/br_netlink_tunnel.c > @@ -315,7 +315,7 @@ int br_process_vlan_tunnel_info(const struct net_bridge *br, > > if (curr_change) > *changed = curr_change; > - __vlan_tunnel_handle_range(p, &v_start, &v_end, v, > + __vlan_tunnel_handle_range(p, &v_start, &v_end, v, > curr_change); I think you also need to adjust the line immediately above. > } > if (v_start && v_end) > -- > 2.20.1.7.g153144c >
On 2/8/23 15:04, Simon Horman wrote: > On Wed, Feb 08, 2023 at 08:56:26AM +0800, Yang Li wrote: >> ./net/bridge/br_netlink_tunnel.c:317:4-27: code aligned with following code on line 318 >> >> Reported-by: Abaci Robot <abaci@linux.alibaba.com> >> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3977 >> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> > > As you may need to respin this: > > Assuming this is targeting net-next, which seems likely to me, > the subject should denote that. Something like this: > > [PATCH net-next] net: bridge: clean up one inconsistent indenting > >> --- >> net/bridge/br_netlink_tunnel.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c >> index 17abf092f7ca..eff949bfdd83 100644 >> --- a/net/bridge/br_netlink_tunnel.c >> +++ b/net/bridge/br_netlink_tunnel.c >> @@ -315,7 +315,7 @@ int br_process_vlan_tunnel_info(const struct net_bridge *br, >> >> if (curr_change) >> *changed = curr_change; >> - __vlan_tunnel_handle_range(p, &v_start, &v_end, v, >> + __vlan_tunnel_handle_range(p, &v_start, &v_end, v, >> curr_change); > > I think you also need to adjust the line immediately above. You meant below, right? :) i.e. "curr_change)", that seems to get misaligned after the change and needs to be adjusted as well. > >> } >> if (v_start && v_end) >> -- >> 2.20.1.7.g153144c >>
On 2/8/23 15:30, Nikolay Aleksandrov wrote: > On 2/8/23 15:04, Simon Horman wrote: >> On Wed, Feb 08, 2023 at 08:56:26AM +0800, Yang Li wrote: >>> ./net/bridge/br_netlink_tunnel.c:317:4-27: code aligned with >>> following code on line 318 >>> >>> Reported-by: Abaci Robot <abaci@linux.alibaba.com> >>> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3977 >>> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> >> >> As you may need to respin this: >> >> Assuming this is targeting net-next, which seems likely to me, >> the subject should denote that. Something like this: >> >> [PATCH net-next] net: bridge: clean up one inconsistent indenting >> >>> --- >>> net/bridge/br_netlink_tunnel.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/net/bridge/br_netlink_tunnel.c >>> b/net/bridge/br_netlink_tunnel.c >>> index 17abf092f7ca..eff949bfdd83 100644 >>> --- a/net/bridge/br_netlink_tunnel.c >>> +++ b/net/bridge/br_netlink_tunnel.c >>> @@ -315,7 +315,7 @@ int br_process_vlan_tunnel_info(const struct >>> net_bridge *br, >>> if (curr_change) >>> *changed = curr_change; >>> - __vlan_tunnel_handle_range(p, &v_start, &v_end, v, >>> + __vlan_tunnel_handle_range(p, &v_start, &v_end, v, >>> curr_change); >> >> I think you also need to adjust the line immediately above. > > You meant below, right? :) i.e. "curr_change)", that seems to get > misaligned after the change and needs to be adjusted as well. > Oh I need coffee, I somehow was thinking about the line being changed instead of literally the line above your statement. :)) Anyway, ack. >> >>> } >>> if (v_start && v_end) >>> -- >>> 2.20.1.7.g153144c >>> >
On Wed, Feb 08, 2023 at 02:31:39PM +0100, Nikolay Aleksandrov wrote: > On 2/8/23 15:30, Nikolay Aleksandrov wrote: > > On 2/8/23 15:04, Simon Horman wrote: > > > On Wed, Feb 08, 2023 at 08:56:26AM +0800, Yang Li wrote: > > > > ./net/bridge/br_netlink_tunnel.c:317:4-27: code aligned with > > > > following code on line 318 > > > > > > > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > > > > Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3977 > > > > Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> > > > > > > As you may need to respin this: > > > > > > Assuming this is targeting net-next, which seems likely to me, > > > the subject should denote that. Something like this: > > > > > > [PATCH net-next] net: bridge: clean up one inconsistent indenting > > > > > > > --- > > > > net/bridge/br_netlink_tunnel.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/net/bridge/br_netlink_tunnel.c > > > > b/net/bridge/br_netlink_tunnel.c > > > > index 17abf092f7ca..eff949bfdd83 100644 > > > > --- a/net/bridge/br_netlink_tunnel.c > > > > +++ b/net/bridge/br_netlink_tunnel.c > > > > @@ -315,7 +315,7 @@ int br_process_vlan_tunnel_info(const struct > > > > net_bridge *br, > > > > if (curr_change) > > > > *changed = curr_change; > > > > - __vlan_tunnel_handle_range(p, &v_start, &v_end, v, > > > > + __vlan_tunnel_handle_range(p, &v_start, &v_end, v, > > > > curr_change); > > > > > > I think you also need to adjust the line immediately above. > > > > You meant below, right? :) i.e. "curr_change)", that seems to get > > misaligned after the change and needs to be adjusted as well. > > > > Oh I need coffee, I somehow was thinking about the line being changed > instead of literally the line above your statement. :)) No problem. We are talking about the same line :) > Anyway, ack.
diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c index 17abf092f7ca..eff949bfdd83 100644 --- a/net/bridge/br_netlink_tunnel.c +++ b/net/bridge/br_netlink_tunnel.c @@ -315,7 +315,7 @@ int br_process_vlan_tunnel_info(const struct net_bridge *br, if (curr_change) *changed = curr_change; - __vlan_tunnel_handle_range(p, &v_start, &v_end, v, + __vlan_tunnel_handle_range(p, &v_start, &v_end, v, curr_change); } if (v_start && v_end)
./net/bridge/br_netlink_tunnel.c:317:4-27: code aligned with following code on line 318 Reported-by: Abaci Robot <abaci@linux.alibaba.com> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3977 Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> --- net/bridge/br_netlink_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)