[patch] remove Orphaned code (slhc_install)

From: Paul Gortmaker (p_gortmaker@yahoo.com)
Date: Mon May 22 2000 - 18:47:38 EST


At some point before 2.2.0, slhc_install became obsolete but the
function was stubbed out and the hook for it was never removed.
(The hook even migrated from net/core/dev.c to drivers/net/setup.c
without getting the axe...)

The following patch (2399pre8) gets rid of slhc_install and
the associated one line header file. I've also sent Alan a
v2.2.15 of the same.

Paul.

diff -ur linux-2399-8/drivers/net/setup.c linux/drivers/net/setup.c
--- linux-2399-8/drivers/net/setup.c Mon May 22 18:53:23 2000
+++ linux/drivers/net/setup.c Mon May 22 18:53:20 2000
@@ -12,7 +12,6 @@
 extern int slip_init_ctrl_dev(void);
 extern int strip_init_ctrl_dev(void);
 extern int x25_asy_init_ctrl_dev(void);
-extern int slhc_install(void);
   
 extern int dmascc_init(void);
 extern int yam_init(void);
@@ -78,22 +77,12 @@
 #endif
 #if defined(CONFIG_COMX)
         {comx_init, 0},
-#endif /*
- * SLHC if present needs attaching so other people see it
- * even if not opened.
- */
+#endif
+
 #if defined(CONFIG_LANMEDIA)
         {lmc_setup, 0},
 #endif
          
-#ifdef CONFIG_INET
-#if (defined(CONFIG_SLIP) && defined(CONFIG_SLIP_COMPRESSED)) \
- || defined(CONFIG_PPP) \
- || (defined(CONFIG_ISDN) && defined(CONFIG_ISDN_PPP))
- {slhc_install, 0},
-#endif
-#endif
-
 /*
 *
 * Wireless non-HAM
diff -ur linux-2399-8/drivers/net/slhc.c linux/drivers/net/slhc.c
--- linux-2399-8/drivers/net/slhc.c Sun May 14 16:04:00 2000
+++ linux/drivers/net/slhc.c Mon May 22 18:18:14 2000
@@ -77,7 +77,6 @@
 #include <linux/timer.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <linux/init.h>
 #include <net/checksum.h>
 #include <net/slhc_vj.h>
 #include <asm/unaligned.h>
@@ -749,12 +748,6 @@
 void cleanup_module(void)
 {
         return;
-}
-
-#else /* MODULE */
-int __init slhc_install(void)
-{
- return 0;
 }
 
 #endif /* MODULE */
diff -ur linux-2399-8/include/net/slhc.h linux/include/net/slhc.h
--- linux-2399-8/include/net/slhc.h Sun May 14 16:03:26 2000
+++ linux/include/net/slhc.h Mon May 22 18:18:43 2000
@@ -1,6 +0,0 @@
-#ifndef __NET_SLHC_H
-#define __NET_SLHC_H
-
-extern void slhc_install(void);
-
-#endif
diff -ur linux-2399-8/net/core/dev.c linux/net/core/dev.c
--- linux-2399-8/net/core/dev.c Sun May 14 16:03:50 2000
+++ linux/net/core/dev.c Mon May 22 19:17:15 2000
@@ -79,7 +79,6 @@
 #include <linux/brlock.h>
 #include <net/sock.h>
 #include <linux/rtnetlink.h>
-#include <net/slhc.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/if_bridge.h>

__________________________________________________
Do You Yahoo!?
Talk to your friends online with Yahoo! Messenger.
http://im.yahoo.com

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Tue May 23 2000 - 21:00:23 EST