| Message ID | 20190116142458.19542-5-starnight@g.ncu.edu.tw |
|---|---|
| State | RFC |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: lorawan: Refine the lorawan protocol module | expand |
Wed, Jan 16, 2019 at 03:25:02PM CET, starnight@g.ncu.edu.tw wrote: >Split LoRaWAN related skb definitions from lora/lorawan_netdev.h into >another header lora/lorawan_skb.h. What is the motivation for this change?
Am 16.01.19 um 15:36 schrieb Jiri Pirko: > Wed, Jan 16, 2019 at 03:25:02PM CET, starnight@g.ncu.edu.tw wrote: >> Split LoRaWAN related skb definitions from lora/lorawan_netdev.h into >> another header lora/lorawan_skb.h. > > What is the motivation for this change? I suggested it because skbs could be used with either LoRa or LoRaWAN netdevs. I have a lora/skb.h. In general the lorawan_foo.h looks ugly to me, so I thought I suggested to avoid that by using [lora/]lorawan/skb.h? Regards, Andreas
Andreas Färber <afaerber@suse.de> 於 2019年1月16日 週三 下午10:50寫道： > > Am 16.01.19 um 15:36 schrieb Jiri Pirko: > > Wed, Jan 16, 2019 at 03:25:02PM CET, starnight@g.ncu.edu.tw wrote: > >> Split LoRaWAN related skb definitions from lora/lorawan_netdev.h into > >> another header lora/lorawan_skb.h. > > > > What is the motivation for this change? > > I suggested it because skbs could be used with either LoRa or LoRaWAN > netdevs. I have a lora/skb.h. > > In general the lorawan_foo.h looks ugly to me, so I thought I suggested > to avoid that by using [lora/]lorawan/skb.h? Seems we have some choices: 1. Split the lorawan skb stuff from lora/lorawan_netdev.h and merge into include/linux/lora/skb.h 2. Split the lorawan skb stuff from lora/lorawan_netdev.h to include/linux/lora/lorawan_skb.h 3. Split the lorawan skb stuff from lora/lorawan_netdev.h to include/linux/lora/lorawan/skb.h 4. Split the lorawan skb stuff from lora/lorawan_netdev.h to include/linux/lorawan/skb.h #1, #2 and #3 are good to me. So, the intersection is choice #3. Regards, Jian-Hong Pan
diff --git a/include/linux/lora/lorawan_netdev.h b/include/linux/lora/lorawan_netdev.h index a6c94cb96bf4..e515ba1ab508 100644 --- a/include/linux/lora/lorawan_netdev.h +++ b/include/linux/lora/lorawan_netdev.h @@ -28,24 +28,4 @@ struct sockaddr_lorawan { struct lrw_addr_in addr_in; }; -/** - * lrw_mac_cb - This structure holds the control buffer (cb) of sk_buff - * - * @devaddr: the LoRaWAN device address of this LoRaWAN hardware - */ -struct lrw_mac_cb { - u32 devaddr; -}; - -/** - * lrw_get_mac_cb - Get the LoRaWAN MAC control buffer of the sk_buff - * @skb: the exchanging sk_buff - * - * Return: the pointer of LoRaWAN MAC control buffer - */ -static inline struct lrw_mac_cb *lrw_get_mac_cb(struct sk_buff *skb) -{ - return (struct lrw_mac_cb *)skb->cb; -} - #endif diff --git a/include/linux/lora/lorawan_skb.h b/include/linux/lora/lorawan_skb.h new file mode 100644 index 000000000000..ea4f900b37be --- /dev/null +++ b/include/linux/lora/lorawan_skb.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ +/* + * LoRaWAN socket buffer related definitions + * + * Copyright (c) 2018 Jian-Hong Pan <starnight@g.ncu.edu.tw> + */ + +#ifndef __LORAWAN_SKB_H__ +#define __LORAWAN_SKB_H__ + +#include <linux/skbuff.h> + +/** + * lrw_mac_cb - This structure holds the control buffer (cb) of sk_buff + * + * @devaddr: the LoRaWAN device address of this LoRaWAN hardware + */ +struct lrw_mac_cb { + u32 devaddr; +}; + +/** + * lrw_get_mac_cb - Get the LoRaWAN MAC control buffer of the sk_buff + * @skb: the exchanging sk_buff + * + * Return: the pointer of LoRaWAN MAC control buffer + */ +static inline struct lrw_mac_cb *lrw_get_mac_cb(struct sk_buff *skb) +{ + return (struct lrw_mac_cb *)skb->cb; +} + +#endif diff --git a/net/lorawan/socket.c b/net/lorawan/socket.c index 7139fab63159..50559ba0c538 100644 --- a/net/lorawan/socket.c +++ b/net/lorawan/socket.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/list.h> #include <linux/lora/lorawan_netdev.h> +#include <linux/lora/lorawan_skb.h> #include <linux/module.h> #include <linux/net.h> #include <linux/termios.h> /* For TIOCOUTQ/INQ */
Split LoRaWAN related skb definitions from lora/lorawan_netdev.h into another header lora/lorawan_skb.h. Signed-off-by: Jian-Hong Pan <starnight@g.ncu.edu.tw> --- include/linux/lora/lorawan_netdev.h | 20 ----------------- include/linux/lora/lorawan_skb.h | 33 +++++++++++++++++++++++++++++ net/lorawan/socket.c | 1 + 3 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 include/linux/lora/lorawan_skb.h