[PATCH net-next] tun: Fix code style issues in <linux/if_vlan.h>

Yunjian Wang posted 1 patch 1 year, 10 months ago
include/linux/if_tun.h | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
[PATCH net-next] tun: Fix code style issues in <linux/if_vlan.h>
Posted by Yunjian Wang 1 year, 10 months ago
This fixes the following code style problem:
- WARNING: please, no spaces at the start of a line
- CHECK: Please use a blank line after
         function/struct/union/enum declarations

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 include/linux/if_tun.h | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 2a7660843444..043d442994b0 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -27,44 +27,54 @@ struct tun_xdp_hdr {
 #if defined(CONFIG_TUN) || defined(CONFIG_TUN_MODULE)
 struct socket *tun_get_socket(struct file *);
 struct ptr_ring *tun_get_tx_ring(struct file *file);
+
 static inline bool tun_is_xdp_frame(void *ptr)
 {
-       return (unsigned long)ptr & TUN_XDP_FLAG;
+	return (unsigned long)ptr & TUN_XDP_FLAG;
 }
+
 static inline void *tun_xdp_to_ptr(struct xdp_frame *xdp)
 {
-       return (void *)((unsigned long)xdp | TUN_XDP_FLAG);
+	return (void *)((unsigned long)xdp | TUN_XDP_FLAG);
 }
+
 static inline struct xdp_frame *tun_ptr_to_xdp(void *ptr)
 {
-       return (void *)((unsigned long)ptr & ~TUN_XDP_FLAG);
+	return (void *)((unsigned long)ptr & ~TUN_XDP_FLAG);
 }
+
 void tun_ptr_free(void *ptr);
 #else
 #include <linux/err.h>
 #include <linux/errno.h>
 struct file;
 struct socket;
+
 static inline struct socket *tun_get_socket(struct file *f)
 {
 	return ERR_PTR(-EINVAL);
 }
+
 static inline struct ptr_ring *tun_get_tx_ring(struct file *f)
 {
 	return ERR_PTR(-EINVAL);
 }
+
 static inline bool tun_is_xdp_frame(void *ptr)
 {
 	return false;
 }
+
 static inline void *tun_xdp_to_ptr(struct xdp_frame *xdp)
 {
 	return NULL;
 }
+
 static inline struct xdp_frame *tun_ptr_to_xdp(void *ptr)
 {
 	return NULL;
 }
+
 static inline void tun_ptr_free(void *ptr)
 {
 }
-- 
2.33.0
Re: [PATCH net-next] tun: Fix code style issues in <linux/if_vlan.h>
Posted by Willem de Bruijn 1 year, 10 months ago
Yunjian Wang wrote:
> This fixes the following code style problem:
> - WARNING: please, no spaces at the start of a line
> - CHECK: Please use a blank line after
>          function/struct/union/enum declarations
> 
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
>  include/linux/if_tun.h | 16 +++++++++++++---

Subject: s/if_vlan/if_tun/
RE: [PATCH net-next] tun: Fix code style issues in <linux/if_vlan.h>
Posted by wangyunjian 1 year, 10 months ago
> -----Original Message-----
> From: Willem de Bruijn [mailto:willemdebruijn.kernel@gmail.com]
> Sent: Thursday, February 1, 2024 11:45 PM
> To: wangyunjian <wangyunjian@huawei.com>;
> willemdebruijn.kernel@gmail.com; jasowang@redhat.com; kuba@kernel.org;
> davem@davemloft.net
> Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org; xudingke
> <xudingke@huawei.com>; wangyunjian <wangyunjian@huawei.com>
> Subject: Re: [PATCH net-next] tun: Fix code style issues in <linux/if_vlan.h>
> 
> Yunjian Wang wrote:
> > This fixes the following code style problem:
> > - WARNING: please, no spaces at the start of a line
> > - CHECK: Please use a blank line after
> >          function/struct/union/enum declarations
> >
> > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> > ---
> >  include/linux/if_tun.h | 16 +++++++++++++---
> 
> Subject: s/if_vlan/if_tun/
Yep, my bad, will send v2 with correction.
Thanks