| Message ID | 1706858755-47204-1-git-send-email-wangyunjian@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bd8a8d5ec5048ef74002d9f3db5cae971e68712c |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] tun: Fix code style issues in <linux/if_tun.h> | expand |
Fri, Feb 02, 2024 at 08:25:55AM CET, wangyunjian@huawei.com 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> Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Jiri Pirko wrote: > Fri, Feb 02, 2024 at 08:25:55AM CET, wangyunjian@huawei.com 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> > > Reviewed-by: Jiri Pirko <jiri@nvidia.com> Reviewed-by: Willem de Bruijn <willemb@google.com>
On Fri, Feb 2, 2024 at 3:26 PM Yunjian Wang <wangyunjian@huawei.com> 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> > --- Acked-by: Jason Wang <jasowang@redhat.com> Thanks
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 2 Feb 2024 15:25:55 +0800 you 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> > > [...] Here is the summary with links: - [net-next,v2] tun: Fix code style issues in <linux/if_tun.h> https://git.kernel.org/netdev/net-next/c/bd8a8d5ec504 You are awesome, thank you!
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) { }
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(-)