* Re: linux-next: Tree for Apr 23 (ax.25 sysctl)
2012-04-23 16:25 ` linux-next: Tree for Apr 23 (ax.25 sysctl) Randy Dunlap
@ 2012-04-24 0:16 ` Eric W. Biederman
2012-04-24 0:23 ` [PATCH] net ax25: Fix the build when sysctl support is disabled Eric W. Biederman
2012-04-24 0:25 ` Eric W. Biederman
2 siblings, 0 replies; 6+ messages in thread
From: Eric W. Biederman @ 2012-04-24 0:16 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, netdev, linux-hams,
Ralf Baechle
Randy Dunlap <rdunlap@xenotime.net> writes:
> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20120420:
>
>
>
> include/net/ax25.h:447:75: error: expected ';' before '}' token
>
>
> static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
> static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
>
> Is this from Eric B.'s sysctl patches?
Sort of. I made the function per device and return 0.
I missed the inner ';' when I made the change. The outer '};' has
been there for years and has been weird but harmless.
Patch to fix it in a moment.
Eric
> First function: move ';' inside braces.
> Second function: drop the ';'.
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] net ax25: Fix the build when sysctl support is disabled.
2012-04-23 16:25 ` linux-next: Tree for Apr 23 (ax.25 sysctl) Randy Dunlap
2012-04-24 0:16 ` Eric W. Biederman
@ 2012-04-24 0:23 ` Eric W. Biederman
2012-04-24 0:25 ` Eric W. Biederman
2 siblings, 0 replies; 6+ messages in thread
From: Eric W. Biederman @ 2012-04-24 0:23 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, netdev, linux-hams,
Ralf Baechle
Randy Dunlap <rdunlap@xenotime.net> reported:
> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20120420:
>
>
> include/net/ax25.h:447:75: error: expected ';' before '}' token
>
> static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
> static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
>
> First function: move ';' inside braces.
> Second function: drop the ';'.
Put the semicolons where it makes sense.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
include/net/ax25.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/net/ax25.h b/include/net/ax25.h
index 8a7a122..5d23521 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -444,8 +444,8 @@ extern void ax25_uid_free(void);
extern int ax25_register_dev_sysctl(ax25_dev *ax25_dev);
extern void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev);
#else
-static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
-static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
+static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0; }
+static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {}
#endif /* CONFIG_SYSCTL */
#endif
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] net ax25: Fix the build when sysctl support is disabled.
2012-04-23 16:25 ` linux-next: Tree for Apr 23 (ax.25 sysctl) Randy Dunlap
2012-04-24 0:16 ` Eric W. Biederman
2012-04-24 0:23 ` [PATCH] net ax25: Fix the build when sysctl support is disabled Eric W. Biederman
@ 2012-04-24 0:25 ` Eric W. Biederman
2012-04-24 1:28 ` Randy Dunlap
2 siblings, 1 reply; 6+ messages in thread
From: Eric W. Biederman @ 2012-04-24 0:25 UTC (permalink / raw)
To: David Miller
Cc: Stephen Rothwell, linux-next, LKML, netdev, linux-hams,
Ralf Baechle, Randy Dunlap
Randy Dunlap <rdunlap@xenotime.net> reported:
> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20120420:
>
>
> include/net/ax25.h:447:75: error: expected ';' before '}' token
>
> static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
> static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
>
> First function: move ';' inside braces.
> Second function: drop the ';'.
Put the semicolons where it makes sense.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
Resent to include David Miller.
include/net/ax25.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/net/ax25.h b/include/net/ax25.h
index 8a7a122..5d23521 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -444,8 +444,8 @@ extern void ax25_uid_free(void);
extern int ax25_register_dev_sysctl(ax25_dev *ax25_dev);
extern void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev);
#else
-static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
-static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
+static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0; }
+static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {}
#endif /* CONFIG_SYSCTL */
#endif
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] net ax25: Fix the build when sysctl support is disabled.
2012-04-24 0:25 ` Eric W. Biederman
@ 2012-04-24 1:28 ` Randy Dunlap
2012-04-24 2:15 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2012-04-24 1:28 UTC (permalink / raw)
To: Eric W. Biederman
Cc: David Miller, Stephen Rothwell, linux-next, LKML, netdev,
linux-hams, Ralf Baechle
On 04/23/2012 05:25 PM, Eric W. Biederman wrote:
>
> Randy Dunlap <rdunlap@xenotime.net> reported:
>
>> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Changes since 20120420:
>>
>>
>> include/net/ax25.h:447:75: error: expected ';' before '}' token
>>
>> static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
>> static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
>>
>> First function: move ';' inside braces.
>> Second function: drop the ';'.
>
> Put the semicolons where it makes sense.
>
> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks.
> ---
>
> Resent to include David Miller.
>
> include/net/ax25.h | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/ax25.h b/include/net/ax25.h
> index 8a7a122..5d23521 100644
> --- a/include/net/ax25.h
> +++ b/include/net/ax25.h
> @@ -444,8 +444,8 @@ extern void ax25_uid_free(void);
> extern int ax25_register_dev_sysctl(ax25_dev *ax25_dev);
> extern void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev);
> #else
> -static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
> -static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
> +static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0; }
> +static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {}
> #endif /* CONFIG_SYSCTL */
>
> #endif
--
~Randy
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] net ax25: Fix the build when sysctl support is disabled.
2012-04-24 1:28 ` Randy Dunlap
@ 2012-04-24 2:15 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2012-04-24 2:15 UTC (permalink / raw)
To: rdunlap; +Cc: ebiederm, sfr, linux-next, linux-kernel, netdev, linux-hams, ralf
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Mon, 23 Apr 2012 18:28:45 -0700
> On 04/23/2012 05:25 PM, Eric W. Biederman wrote:
>
>>
>> Randy Dunlap <rdunlap@xenotime.net> reported:
>>
>>> On 04/23/2012 12:07 AM, Stephen Rothwell wrote:
>>>
>>>> Hi all,
>>>>
>>>> Changes since 20120420:
>>>
>>>
>>> include/net/ax25.h:447:75: error: expected ';' before '}' token
>>>
>>> static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0 };
>>> static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {};
>>>
>>> First function: move ';' inside braces.
>>> Second function: drop the ';'.
>>
>> Put the semicolons where it makes sense.
>>
>> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
>
>
> Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Applied, thanks guys.
^ permalink raw reply [flat|nested] 6+ messages in thread