| Message ID | 20220520003614.6073-1-eng.alaamohamedsoliman.am@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c2e10f53455c898050738d6a5f8c237f27aec225 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] net: vxlan: Fix kernel coding style | expand |
On 5/19/22 17:36, Alaa Mohamed wrote: > The continuation line does not align with the opening bracket > and this patch fix it. > > Signed-off-by: Alaa Mohamed <eng.alaamohamedsoliman.am@gmail.com> > --- > changes in v2: > fix the alignment of the "DST, VNI, ifindex and port are mutually exclusive with NH_ID" > string to the open parenthesis of the NL_SET_ERR_MSG macro in vxlan_fdb_parse(). > --- > drivers/net/vxlan/vxlan_core.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c > index 293082c32a78..29db08f15e38 100644 > --- a/drivers/net/vxlan/vxlan_core.c > +++ b/drivers/net/vxlan/vxlan_core.c > @@ -1138,7 +1138,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan, > if (tb[NDA_NH_ID] && (tb[NDA_DST] || tb[NDA_VNI] || tb[NDA_IFINDEX] || > tb[NDA_PORT])) { > NL_SET_ERR_MSG(extack, > - "DST, VNI, ifindex and port are mutually exclusive with NH_ID"); > + "DST, VNI, ifindex and port are mutually exclusive with NH_ID"); it looks still off by a space. > return -EINVAL; > } this closing brace should line up with the if > > @@ -1297,7 +1297,7 @@ int __vxlan_fdb_delete(struct vxlan_dev *vxlan, > static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], > struct net_device *dev, > const unsigned char *addr, u16 vid, > - struct netlink_ext_ack *extack) > + struct netlink_ext_ack *extack) > { > struct vxlan_dev *vxlan = netdev_priv(dev); > union vxlan_addr ip;
On Thu, 19 May 2022 22:06:53 -0700 Roopa Prabhu wrote: > > @@ -1138,7 +1138,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan, > > if (tb[NDA_NH_ID] && (tb[NDA_DST] || tb[NDA_VNI] || tb[NDA_IFINDEX] || > > tb[NDA_PORT])) { > > NL_SET_ERR_MSG(extack, > > - "DST, VNI, ifindex and port are mutually exclusive with NH_ID"); > > + "DST, VNI, ifindex and port are mutually exclusive with NH_ID"); > it looks still off by a space. > > > return -EINVAL; > > } > > > this closing brace should line up with the if Let me just fix this myself when applying... There were 3 separate postings of v2, and they weren't even identical :(
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Fri, 20 May 2022 02:36:14 +0200 you wrote: > The continuation line does not align with the opening bracket > and this patch fix it. > > Signed-off-by: Alaa Mohamed <eng.alaamohamedsoliman.am@gmail.com> > --- > changes in v2: > fix the alignment of the "DST, VNI, ifindex and port are mutually exclusive with NH_ID" > string to the open parenthesis of the NL_SET_ERR_MSG macro in vxlan_fdb_parse(). > > [...] Here is the summary with links: - [net-next,v2] net: vxlan: Fix kernel coding style https://git.kernel.org/netdev/net-next/c/c2e10f53455c You are awesome, thank you!
On 5/20/22 17:40, Jakub Kicinski wrote: > On Thu, 19 May 2022 22:06:53 -0700 Roopa Prabhu wrote: >>> @@ -1138,7 +1138,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan, >>> if (tb[NDA_NH_ID] && (tb[NDA_DST] || tb[NDA_VNI] || tb[NDA_IFINDEX] || >>> tb[NDA_PORT])) { >>> NL_SET_ERR_MSG(extack, >>> - "DST, VNI, ifindex and port are mutually exclusive with NH_ID"); >>> + "DST, VNI, ifindex and port are mutually exclusive with NH_ID"); >> it looks still off by a space. >> >>> return -EINVAL; >>> } >> >> this closing brace should line up with the if > Let me just fix this myself when applying... There were 3 separate > postings of v2, and they weren't even identical :( thanks Jakub, Alaa, when you accidentally send the same patch multiple times, you can reply on the list and leave a note to the maintainer on which ones to ignore (lets add this to the outreachy kernel patch submission instructions if not already there)
diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index 293082c32a78..29db08f15e38 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -1138,7 +1138,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan, if (tb[NDA_NH_ID] && (tb[NDA_DST] || tb[NDA_VNI] || tb[NDA_IFINDEX] || tb[NDA_PORT])) { NL_SET_ERR_MSG(extack, - "DST, VNI, ifindex and port are mutually exclusive with NH_ID"); + "DST, VNI, ifindex and port are mutually exclusive with NH_ID"); return -EINVAL; } @@ -1297,7 +1297,7 @@ int __vxlan_fdb_delete(struct vxlan_dev *vxlan, static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], struct net_device *dev, const unsigned char *addr, u16 vid, - struct netlink_ext_ack *extack) + struct netlink_ext_ack *extack) { struct vxlan_dev *vxlan = netdev_priv(dev); union vxlan_addr ip;
The continuation line does not align with the opening bracket and this patch fix it. Signed-off-by: Alaa Mohamed <eng.alaamohamedsoliman.am@gmail.com> --- changes in v2: fix the alignment of the "DST, VNI, ifindex and port are mutually exclusive with NH_ID" string to the open parenthesis of the NL_SET_ERR_MSG macro in vxlan_fdb_parse(). --- drivers/net/vxlan/vxlan_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)