| 5de4fc43 |
1 | # This is a BitKeeper generated patch for the following project: |
| 2 | # Project Name: Linux kernel tree |
| 3 | # This patch format is intended for GNU patch command version 2.5 or higher. |
| 4 | # This patch includes the following deltas: |
| 5 | # ChangeSet 1.1340.1.33 -> 1.1340.1.34 |
| 6 | # net/appletalk/sysctl_net_atalk.c 1.4 -> 1.5 |
| 7 | # net/appletalk/ddp.c 1.37 -> 1.38 |
| 8 | # |
| 9 | # The following is the BitKeeper ChangeSet Log |
| 10 | # -------------------------------------------- |
| 11 | # 03/10/16 torvalds@home.osdl.org 1.1340.19.2 |
| 12 | # Merge http://lia64.bkbits.net/to-linus-2.5 |
| 13 | # into home.osdl.org:/home/torvalds/v2.5/linux |
| 14 | # -------------------------------------------- |
| 15 | # 03/10/16 torvalds@home.osdl.org 1.1342 |
| 16 | # Merge http://mdomsch.bkbits.net/linux-2.5-edd |
| 17 | # into home.osdl.org:/home/torvalds/v2.5/linux |
| 18 | # -------------------------------------------- |
| 19 | # 03/10/17 noah@caltech.edu 1.1340.1.34 |
| 20 | # Add static inline stubs of atalk_(un)?register_sysctl to net/appletalk/ddp.c |
| 21 | # and remove the #ifdef CONFIG_SYSCTL and the extern stub functions from |
| 22 | # net/appletalk/sysctl_net_atalk.c. This fixes a link error in the absence of |
| 23 | # CONFIG_SYSCTL and saves space. |
| 24 | # -------------------------------------------- |
| 25 | # |
| 26 | diff -Nru a/net/appletalk/ddp.c b/net/appletalk/ddp.c |
| 27 | --- a/net/appletalk/ddp.c Fri Oct 17 16:23:47 2003 |
| 28 | +++ b/net/appletalk/ddp.c Fri Oct 17 16:23:47 2003 |
| 29 | @@ -68,8 +68,13 @@ |
| 30 | struct atalk_addr *sa); |
| 31 | extern void aarp_proxy_remove(struct net_device *dev, struct atalk_addr *sa); |
| 32 | |
| 33 | +#ifdef CONFIG_SYSCTL |
| 34 | extern void atalk_register_sysctl(void); |
| 35 | extern void atalk_unregister_sysctl(void); |
| 36 | +#else /* CONFIG_SYSCTL */ |
| 37 | +static inline void atalk_register_sysctl(void) { } |
| 38 | +static inline void atalk_unregister_sysctl(void) { } |
| 39 | +#endif /* CONFIG_SYSCTL */ |
| 40 | |
| 41 | struct datalink_proto *ddp_dl, *aarp_dl; |
| 42 | static struct proto_ops atalk_dgram_ops; |
| 43 | @@ -1919,9 +1924,7 @@ |
| 44 | */ |
| 45 | static void __exit atalk_exit(void) |
| 46 | { |
| 47 | -#ifdef CONFIG_SYSCTL |
| 48 | atalk_unregister_sysctl(); |
| 49 | -#endif /* CONFIG_SYSCTL */ |
| 50 | atalk_proc_exit(); |
| 51 | aarp_cleanup_module(); /* General aarp clean-up. */ |
| 52 | unregister_netdevice_notifier(&ddp_notifier); |
| 53 | diff -Nru a/net/appletalk/sysctl_net_atalk.c b/net/appletalk/sysctl_net_atalk.c |
| 54 | --- a/net/appletalk/sysctl_net_atalk.c Fri Oct 17 16:23:47 2003 |
| 55 | +++ b/net/appletalk/sysctl_net_atalk.c Fri Oct 17 16:23:47 2003 |
| 56 | @@ -7,8 +7,6 @@ |
| 57 | */ |
| 58 | |
| 59 | #include <linux/config.h> |
| 60 | - |
| 61 | -#ifdef CONFIG_SYSCTL |
| 62 | #include <linux/sysctl.h> |
| 63 | extern int sysctl_aarp_expiry_time; |
| 64 | extern int sysctl_aarp_tick_time; |
| 65 | @@ -82,13 +80,3 @@ |
| 66 | { |
| 67 | unregister_sysctl_table(atalk_table_header); |
| 68 | } |
| 69 | - |
| 70 | -#else /* CONFIG_PROC_FS */ |
| 71 | -void atalk_register_sysctl(void) |
| 72 | -{ |
| 73 | -} |
| 74 | - |
| 75 | -void atalk_unregister_sysctl(void) |
| 76 | -{ |
| 77 | -} |
| 78 | -#endif /* CONFIG_PROC_FS */ |
projects / packages / kernel.git / blame