2009-12-14 22:02:14

by Andrew Hendry

Subject: [RESEND PATCH 1/3] X25: Move SYSCTL ifdefs into header

Moves the CONFIG_SYSCTL ifdefs in x25_init into header.

Signed-off-by: Andrew Hendry <[email protected]>
Acked-by: "Eric W. Biederman" <[email protected]>

diff -uprN -X a/Documentation/dontdiff a/include/net/x25.h b/include/net/x25.h
--- a/include/net/x25.h 2009-11-10 11:32:31.000000000 +1100
+++ b/include/net/x25.h 2009-11-25 09:05:21.000000000 +1100
@@ -287,8 +287,14 @@ extern unsigned long x25_display_timer(s
extern void x25_check_rbuf(struct sock *);

/* sysctl_net_x25.c */
+#ifdef CONFIG_SYSCTL
extern void x25_register_sysctl(void);
extern void x25_unregister_sysctl(void);
+#else
+static inline void x25_register_sysctl(void) {};
+static inline void x25_unregister_sysctl(void) {};
+#endif /* CONFIG_SYSCTL */
+
struct x25_skb_cb {
unsigned flags;
};
diff -uprN -X a/Documentation/dontdiff a/net/x25/af_x25.c b/net/x25/af_x25.c
--- a/net/x25/af_x25.c 2009-11-17 10:30:18.000000000 +1100
+++ b/net/x25/af_x25.c 2009-11-25 09:04:25.000000000 +1100
@@ -1667,9 +1667,7 @@ static int __init x25_init(void)

printk(KERN_INFO "X.25 for Linux Version 0.2\n");

-#ifdef CONFIG_SYSCTL
x25_register_sysctl();
-#endif
x25_proc_init();
out:
return rc;
@@ -1682,9 +1680,7 @@ static void __exit x25_exit(void)
x25_link_free();
x25_route_free();

-#ifdef CONFIG_SYSCTL
x25_unregister_sysctl();
-#endif

unregister_netdevice_notifier(&x25_dev_notifier);

2009-12-15 05:49:22

by David Miller

Subject: Re: [RESEND PATCH 1/3] X25: Move SYSCTL ifdefs into header

These patches do not apply to the current sources.

Please respin them against net-2.6

In fact it looks like at least your first patch is already in the
tree.

2009-12-15 23:26:24

by Andrew Hendry

Subject: Re: [RESEND PATCH 1/3] X25: Move SYSCTL ifdefs into header

Sorry, ignore these resends, all 3 are were in net-2.6 and made it to linux-next
2f5517aefcfbdd7fdf0f03b13d292a10d445887f
1fd975a0520cdb27681855d5a18526e328d36b5c
429d33ace5ce6122817f8abe9d170eaa55dc3af9
I'll watch git in the future, not the mailing list pull requests to track.

On Tue, Dec 15, 2009 at 4:49 PM, David Miller <[email protected]> wrote:
>
> These patches do not apply to the current sources.
>
> Please respin them against net-2.6
>
> In fact it looks like at least your first patch is already in the
> tree.
>

2009-12-15 23:32:33

by David Miller

Subject: Re: [RESEND PATCH 1/3] X25: Move SYSCTL ifdefs into header

From: andrew hendry <[email protected]>
Date: Wed, 16 Dec 2009 10:26:19 +1100

> Sorry, ignore these resends, all 3 are were in net-2.6 and made it to linux-next
> 2f5517aefcfbdd7fdf0f03b13d292a10d445887f
> 1fd975a0520cdb27681855d5a18526e328d36b5c
> 429d33ace5ce6122817f8abe9d170eaa55dc3af9
> I'll watch git in the future, not the mailing list pull requests to track.

Another good place to check is patchwork:

http://patchwork.ozlabs.org/patch/39256/
http://patchwork.ozlabs.org/patch/39257/
http://patchwork.ozlabs.org/patch/39258/

All of those patches were put into state "applied".

New patches show up at:

http://patchwork.ozlabs.org/project/netdev/list/