[PATCH 1/1 net-next] ieee802154: fix __init functions

[PATCH 1/1 net-next] ieee802154: fix __init functions

[Fabian Frederick]

Commit 3243acd37fd9
("ieee802154: add __init to lowpan_frags_sysctl_register")

added __init to lowpan_frags_ns_sysctl_register instead of
lowpan_frags_sysctl_register

Suggested-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 net/ieee802154/reassembly.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
index 30ec608..7cfcd68 100644
--- a/net/ieee802154/reassembly.c
+++ b/net/ieee802154/reassembly.c
@@ -498,7 +498,7 @@ static void lowpan_frags_sysctl_unregister(void)
 	unregister_net_sysctl_table(lowpan_ctl_header);
 }
 #else
-static inline int __init lowpan_frags_ns_sysctl_register(struct net *net)
+static inline int lowpan_frags_ns_sysctl_register(struct net *net)
 {
 	return 0;
 }
@@ -507,7 +507,7 @@ static inline void lowpan_frags_ns_sysctl_unregister(struct net *net)
 {
 }
 
-static inline int lowpan_frags_sysctl_register(void)
+static inline int __init lowpan_frags_sysctl_register(void)
 {
 	return 0;
 }
-- 
1.9.3

Re: [PATCH 1/1 net-next] ieee802154: fix __init functions

[Marcel Holtmann]

Hi Fabian,

> Commit 3243acd37fd9
> ("ieee802154: add __init to lowpan_frags_sysctl_register")
> 
> added __init to lowpan_frags_ns_sysctl_register instead of
> lowpan_frags_sysctl_register
> 
> Suggested-by: Alexander Aring <alex.aring@gmail.com>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>
> ---
> net/ieee802154/reassembly.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

when trying to apply this to bluetooth-next kernel, I am getting this:

Applying: ieee802154: fix __init functions
error: patch failed: net/ieee802154/reassembly.c:498
error: net/ieee802154/reassembly.c: patch does not apply
Patch failed at 0001 ieee802154: fix __init functions

Regards

Marcel

Re: [PATCH 1/1 net-next] ieee802154: fix __init functions

[David Miller]

From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 1 Oct 2014 07:34:39 +0200

> Hi Fabian,
> 
>> Commit 3243acd37fd9
>> ("ieee802154: add __init to lowpan_frags_sysctl_register")
>> 
>> added __init to lowpan_frags_ns_sysctl_register instead of
>> lowpan_frags_sysctl_register
>> 
>> Suggested-by: Alexander Aring <alex.aring@gmail.com>
>> Signed-off-by: Fabian Frederick <fabf@skynet.be>
>> ---
>> net/ieee802154/reassembly.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> when trying to apply this to bluetooth-next kernel, I am getting this:
> 
> Applying: ieee802154: fix __init functions
> error: patch failed: net/ieee802154/reassembly.c:498
> error: net/ieee802154/reassembly.c: patch does not apply
> Patch failed at 0001 ieee802154: fix __init functions

You haven't been following the conversation.

I already applied his previous patch which had errors to net-next,
so this is a patch relative to net-next which fixes things and
implements the change correctly.

Re: [PATCH 1/1 net-next] ieee802154: fix __init functions

[Alexander Aring]

Hi,

On Wed, Oct 01, 2014 at 07:34:39AM +0200, Marcel Holtmann wrote:
> Hi Fabian,
> 
> > Commit 3243acd37fd9
> > ("ieee802154: add __init to lowpan_frags_sysctl_register")
> > 
> > added __init to lowpan_frags_ns_sysctl_register instead of
> > lowpan_frags_sysctl_register
> > 
> > Suggested-by: Alexander Aring <alex.aring@gmail.com>
> > Signed-off-by: Fabian Frederick <fabf@skynet.be>
> > ---
> > net/ieee802154/reassembly.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> when trying to apply this to bluetooth-next kernel, I am getting this:
> 
> Applying: ieee802154: fix __init functions
> error: patch failed: net/ieee802154/reassembly.c:498
> error: net/ieee802154/reassembly.c: patch does not apply
> Patch failed at 0001 ieee802154: fix __init functions
> 

Fabian:
thanks.


Marcel:
this is a patch for a fix which is already in net-next. Please don't
apply, see [0].


Marcel and David:
Now, we have chaos who will apply now patches for ieee802154. I thought
I apply ieee802154 patches to the wpan-next tree and then send it to
bluetooth-next. Please don't change this patchflow.

Okay, I know sometimes people change the inet_frag api, then it should
go into net/net-next.


- Alex

[0] http://marc.info/?l=linux-netdev&m=141213852806003&w=2

Re: [PATCH 1/1 net-next] ieee802154: fix __init functions

[David Miller]

From: Fabian Frederick <fabf@skynet.be>
Date: Wed,  1 Oct 2014 07:27:46 +0200

> Commit 3243acd37fd9
> ("ieee802154: add __init to lowpan_frags_sysctl_register")
> 
> added __init to lowpan_frags_ns_sysctl_register instead of
> lowpan_frags_sysctl_register
> 
> Suggested-by: Alexander Aring <alex.aring@gmail.com>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

Applied, thanks for sorting this out.