diff mbox series

[wpan-next,2/4] net: mac802154: Include the softMAC stack inside the IEEE 802.15.4 menu

Message ID 20220120004350.308866-3-miquel.raynal@bootlin.com
State New
Headers show
Series ieee802154: General preparation to scan support | expand

Commit Message

Miquel Raynal Jan. 20, 2022, 12:43 a.m. UTC 
From: David Girault <david.girault@qorvo.com>

The softMAC stack has no meaning outside of the IEEE 802.15.4 stack and
cannot be used without it.

Signed-off-by: David Girault <david.girault@qorvo.com>
[miquel.raynal@bootlin.com: Isolate this change from a bigger commit]
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 net/Kconfig            | 1 -
 net/ieee802154/Kconfig | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

Comments

Stefan Schmidt Jan. 27, 2022, 4:04 p.m. UTC | #1 
Hello.

On 20.01.22 01:43, Miquel Raynal wrote:
> From: David Girault <david.girault@qorvo.com>
> 
> The softMAC stack has no meaning outside of the IEEE 802.15.4 stack and
> cannot be used without it.
> 
> Signed-off-by: David Girault <david.girault@qorvo.com>
> [miquel.raynal@bootlin.com: Isolate this change from a bigger commit]
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
> ---
>   net/Kconfig            | 1 -
>   net/ieee802154/Kconfig | 1 +
>   2 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/Kconfig b/net/Kconfig
> index 0da89d09ffa6..a5e31078fd14 100644
> --- a/net/Kconfig
> +++ b/net/Kconfig
> @@ -228,7 +228,6 @@ source "net/x25/Kconfig"
>   source "net/lapb/Kconfig"
>   source "net/phonet/Kconfig"
>   source "net/6lowpan/Kconfig"
> -source "net/mac802154/Kconfig"
>   source "net/sched/Kconfig"
>   source "net/dcb/Kconfig"
>   source "net/dns_resolver/Kconfig"
> diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig
> index 31aed75fe62d..7e4b1d49d445 100644
> --- a/net/ieee802154/Kconfig
> +++ b/net/ieee802154/Kconfig
> @@ -36,6 +36,7 @@ config IEEE802154_SOCKET
>   	  for 802.15.4 dataframes. Also RAW socket interface to build MAC
>   	  header from userspace.
>   
> +source "net/mac802154/Kconfig"
>   source "net/ieee802154/6lowpan/Kconfig"
>   
>   endif
> 

Please fold this patch into the previous one moving the Kconfig option 
around. This can be done in one go.

regards
Stefan Schmidt
Miquel Raynal Jan. 27, 2022, 4:54 p.m. UTC | #2 
Hi Stefan,

stefan@datenfreihafen.org wrote on Thu, 27 Jan 2022 17:04:41 +0100:

> Hello.
> 
> On 20.01.22 01:43, Miquel Raynal wrote:
> > From: David Girault <david.girault@qorvo.com>
> > 
> > The softMAC stack has no meaning outside of the IEEE 802.15.4 stack and
> > cannot be used without it.
> > 
> > Signed-off-by: David Girault <david.girault@qorvo.com>
> > [miquel.raynal@bootlin.com: Isolate this change from a bigger commit]
> > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
> > ---
> >   net/Kconfig            | 1 -
> >   net/ieee802154/Kconfig | 1 +
> >   2 files changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/net/Kconfig b/net/Kconfig
> > index 0da89d09ffa6..a5e31078fd14 100644
> > --- a/net/Kconfig
> > +++ b/net/Kconfig
> > @@ -228,7 +228,6 @@ source "net/x25/Kconfig"
> >   source "net/lapb/Kconfig"
> >   source "net/phonet/Kconfig"
> >   source "net/6lowpan/Kconfig"
> > -source "net/mac802154/Kconfig"
> >   source "net/sched/Kconfig"
> >   source "net/dcb/Kconfig"
> >   source "net/dns_resolver/Kconfig"
> > diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig
> > index 31aed75fe62d..7e4b1d49d445 100644
> > --- a/net/ieee802154/Kconfig
> > +++ b/net/ieee802154/Kconfig
> > @@ -36,6 +36,7 @@ config IEEE802154_SOCKET
> >   	  for 802.15.4 dataframes. Also RAW socket interface to build MAC
> >   	  header from userspace.  
> >   > +source "net/mac802154/Kconfig"  
> >   source "net/ieee802154/6lowpan/Kconfig"  
> >   >   endif  
> >   
> 
> Please fold this patch into the previous one moving the Kconfig option around. This can be done in one go.

Sure.

By the way, I was questioning myself: why is the mac802154 folder
outside of ieee802154? I don't really understand the organization but
as it would massively prevent any of the future changes that I already
prepared to apply correctly, I haven't proposed such a move -yet. But
I would like to know what's the idea behind the current folder
hierarchy?

Thanks,
Miquèl
Stefan Schmidt Jan. 28, 2022, 12:35 p.m. UTC | #3 
Hello.

On 27.01.22 17:54, Miquel Raynal wrote:
> Hi Stefan,
> 
> stefan@datenfreihafen.org wrote on Thu, 27 Jan 2022 17:04:41 +0100:
> 
>> Hello.
>>
>> On 20.01.22 01:43, Miquel Raynal wrote:
>>> From: David Girault <david.girault@qorvo.com>
>>>
>>> The softMAC stack has no meaning outside of the IEEE 802.15.4 stack and
>>> cannot be used without it.
>>>
>>> Signed-off-by: David Girault <david.girault@qorvo.com>
>>> [miquel.raynal@bootlin.com: Isolate this change from a bigger commit]
>>> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
>>> ---
>>>    net/Kconfig            | 1 -
>>>    net/ieee802154/Kconfig | 1 +
>>>    2 files changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/net/Kconfig b/net/Kconfig
>>> index 0da89d09ffa6..a5e31078fd14 100644
>>> --- a/net/Kconfig
>>> +++ b/net/Kconfig
>>> @@ -228,7 +228,6 @@ source "net/x25/Kconfig"
>>>    source "net/lapb/Kconfig"
>>>    source "net/phonet/Kconfig"
>>>    source "net/6lowpan/Kconfig"
>>> -source "net/mac802154/Kconfig"
>>>    source "net/sched/Kconfig"
>>>    source "net/dcb/Kconfig"
>>>    source "net/dns_resolver/Kconfig"
>>> diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig
>>> index 31aed75fe62d..7e4b1d49d445 100644
>>> --- a/net/ieee802154/Kconfig
>>> +++ b/net/ieee802154/Kconfig
>>> @@ -36,6 +36,7 @@ config IEEE802154_SOCKET
>>>    	  for 802.15.4 dataframes. Also RAW socket interface to build MAC
>>>    	  header from userspace.
>>>    > +source "net/mac802154/Kconfig"
>>>    source "net/ieee802154/6lowpan/Kconfig"
>>>    >   endif
>>>    
>>
>> Please fold this patch into the previous one moving the Kconfig option around. This can be done in one go.
> 
> Sure.
> 
> By the way, I was questioning myself: why is the mac802154 folder
> outside of ieee802154? I don't really understand the organization but
> as it would massively prevent any of the future changes that I already
> prepared to apply correctly, I haven't proposed such a move -yet. But
> I would like to know what's the idea behind the current folder
> hierarchy?

The directory structure has been in place from the initial merge of the 
subsystem, before Alex and myself took on the maintainer roles.

I see no reason for a move though. The extra burden for backports, etc 
outweigh the urge of cleanliness on the folder structure. :-)

The Kconfig cleanup and move of the file is worth doing, the move of the 
whole source code folder not.

regards
Stefan Schmidt
Miquel Raynal Jan. 28, 2022, 2:04 p.m. UTC | #4 
Hi Stefan,

stefan@datenfreihafen.org wrote on Fri, 28 Jan 2022 13:35:00 +0100:

> Hello.
> 
> On 27.01.22 17:54, Miquel Raynal wrote:
> > Hi Stefan,
> > 
> > stefan@datenfreihafen.org wrote on Thu, 27 Jan 2022 17:04:41 +0100:
> >   
> >> Hello.
> >>
> >> On 20.01.22 01:43, Miquel Raynal wrote:  
> >>> From: David Girault <david.girault@qorvo.com>
> >>>
> >>> The softMAC stack has no meaning outside of the IEEE 802.15.4 stack and
> >>> cannot be used without it.
> >>>
> >>> Signed-off-by: David Girault <david.girault@qorvo.com>
> >>> [miquel.raynal@bootlin.com: Isolate this change from a bigger commit]
> >>> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
> >>> ---
> >>>    net/Kconfig            | 1 -
> >>>    net/ieee802154/Kconfig | 1 +
> >>>    2 files changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/net/Kconfig b/net/Kconfig
> >>> index 0da89d09ffa6..a5e31078fd14 100644
> >>> --- a/net/Kconfig
> >>> +++ b/net/Kconfig
> >>> @@ -228,7 +228,6 @@ source "net/x25/Kconfig"
> >>>    source "net/lapb/Kconfig"
> >>>    source "net/phonet/Kconfig"
> >>>    source "net/6lowpan/Kconfig"
> >>> -source "net/mac802154/Kconfig"
> >>>    source "net/sched/Kconfig"
> >>>    source "net/dcb/Kconfig"
> >>>    source "net/dns_resolver/Kconfig"
> >>> diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig
> >>> index 31aed75fe62d..7e4b1d49d445 100644
> >>> --- a/net/ieee802154/Kconfig
> >>> +++ b/net/ieee802154/Kconfig
> >>> @@ -36,6 +36,7 @@ config IEEE802154_SOCKET
> >>>    	  for 802.15.4 dataframes. Also RAW socket interface to build MAC
> >>>    	  header from userspace.  
> >>>    > +source "net/mac802154/Kconfig"  
> >>>    source "net/ieee802154/6lowpan/Kconfig"  
> >>>    >   endif  
> >>>    >>  
> >> Please fold this patch into the previous one moving the Kconfig option around. This can be done in one go.  
> > 
> > Sure.
> > 
> > By the way, I was questioning myself: why is the mac802154 folder
> > outside of ieee802154? I don't really understand the organization but
> > as it would massively prevent any of the future changes that I already
> > prepared to apply correctly, I haven't proposed such a move -yet. But
> > I would like to know what's the idea behind the current folder
> > hierarchy?  
> 
> The directory structure has been in place from the initial merge of the subsystem, before Alex and myself took on the maintainer roles.
> 
> I see no reason for a move though. The extra burden for backports, etc outweigh the urge of cleanliness on the folder structure. :-)

That's fair.

> The Kconfig cleanup and move of the file is worth doing, the move of the whole source code folder not.

I agree there is more interesting and less impacting to do in the area,
I was just wondering about that choice.

Thanks,
Miquèl
Alexander Aring Jan. 30, 2022, 8:55 p.m. UTC | #5 
Hi,

On Wed, Jan 19, 2022 at 7:43 PM Miquel Raynal <miquel.raynal@bootlin.com> wrote:
>
> From: David Girault <david.girault@qorvo.com>
>
> The softMAC stack has no meaning outside of the IEEE 802.15.4 stack and
> cannot be used without it.
>

that's why there is a "depends on" in there.

> Signed-off-by: David Girault <david.girault@qorvo.com>
> [miquel.raynal@bootlin.com: Isolate this change from a bigger commit]
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
> ---
>  net/Kconfig            | 1 -
>  net/ieee802154/Kconfig | 1 +
>  2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/Kconfig b/net/Kconfig
> index 0da89d09ffa6..a5e31078fd14 100644
> --- a/net/Kconfig
> +++ b/net/Kconfig
> @@ -228,7 +228,6 @@ source "net/x25/Kconfig"
>  source "net/lapb/Kconfig"
>  source "net/phonet/Kconfig"
>  source "net/6lowpan/Kconfig"
> -source "net/mac802154/Kconfig"
>  source "net/sched/Kconfig"
>  source "net/dcb/Kconfig"
>  source "net/dns_resolver/Kconfig"
> diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig
> index 31aed75fe62d..7e4b1d49d445 100644
> --- a/net/ieee802154/Kconfig
> +++ b/net/ieee802154/Kconfig
> @@ -36,6 +36,7 @@ config IEEE802154_SOCKET
>           for 802.15.4 dataframes. Also RAW socket interface to build MAC
>           header from userspace.
>
> +source "net/mac802154/Kconfig"
>  source "net/ieee802154/6lowpan/Kconfig"

The next person in a year will probably argue "but wireless do source
of wireless/mac80211 in net/Kconfig... so this is wrong".
To avoid this issue maybe we should take out the menuentry here and do
whatever wireless is doing without questioning it?

- Alex
diff mbox series

Patch

diff --git a/net/Kconfig b/net/Kconfig
index 0da89d09ffa6..a5e31078fd14 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -228,7 +228,6 @@  source "net/x25/Kconfig"
 source "net/lapb/Kconfig"
 source "net/phonet/Kconfig"
 source "net/6lowpan/Kconfig"
-source "net/mac802154/Kconfig"
 source "net/sched/Kconfig"
 source "net/dcb/Kconfig"
 source "net/dns_resolver/Kconfig"
diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig
index 31aed75fe62d..7e4b1d49d445 100644
--- a/net/ieee802154/Kconfig
+++ b/net/ieee802154/Kconfig
@@ -36,6 +36,7 @@  config IEEE802154_SOCKET
 	  for 802.15.4 dataframes. Also RAW socket interface to build MAC
 	  header from userspace.
 
+source "net/mac802154/Kconfig"
 source "net/ieee802154/6lowpan/Kconfig"
 
 endif