Skip to contentSkip to conversation

(14/14) move last of irsyms.c to irmod.c

PATCH New Jean Tourrilhes 1 participant 1 message Mar 9, 2004 Networking

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 (14/14) move last of irsyms.c to irmod.c

ir264_irsyms_14_irmod.diff :
~~~~~~~~~~~~~~~~~~~~~~~~~~
<Original patch from Stephen Hemminger>
(14/14) move last of irsyms.c to irmod.c

Move last bits of code out of irsyms and onto irmod.c where initialization happens.

Move irda_debug parameter out of irsyms.c into irmod.c and make it a new style module parameter.

Removes file net/irda/irsyms.c completely; check this in case mailer seems to barf on the line the character in University of Tromso

include/net/irda/irda.h renamed from include/net/irda.sD/irda.h +1 -1
diff -u -p -r linux/include/net/irda.sD/irda.h linux/include/net/irda/irda.h
@@ -61,7 +61,7 @@ typedef __u32 magic_t;
 
 #ifdef CONFIG_IRDA_DEBUG
 
-extern __u32 irda_debug;
+extern unsigned int irda_debug;
 
 /* use 0 for production, 1 for verification, >2 for debug */
 #define IRDA_DEBUG_LEVEL 0
net/irda/Makefile renamed from net/irda.sD/Makefile +1 -1
diff -u -p -r --new-file linux/net/irda.sD/Makefile linux/net/irda/Makefile
@@ -10,6 +10,6 @@ obj-$(CONFIG_IRCOMM) += ircomm/
 irda-y := iriap.o iriap_event.o irlmp.o irlmp_event.o irlmp_frame.o \
           irlap.o irlap_event.o irlap_frame.o timer.o qos.o irqueue.o \
           irttp.o irda_device.o irias_object.o crc.o wrapper.o af_irda.o \
-	  discovery.o parameters.o irsyms.o
+	  discovery.o parameters.o irmod.o
 irda-$(CONFIG_PROC_FS) += irproc.o
 irda-$(CONFIG_SYSCTL) += irsysctl.o
net/irda/irmod.c renamed from net/irda.sD/irmod.c +185 -0

185 lines not on this page · raw message

net/irda/irsyms.c renamed from net/irda.sD/irsyms.c +0 -202

202 lines not on this page · raw message

net/irda/irsysctl.c renamed from net/irda.sD/irsysctl.c +1 -5
diff -u -p -r --new-file linux/net/irda.sD/irsysctl.c linux/net/irda/irsysctl.c
@@ -29,7 +29,7 @@
 #include <linux/sysctl.h>
 #include <linux/init.h>
 
-#include <net/irda/irda.h>
+#include <net/irda/irda.h>		/* irda_debug */
 #include <net/irda/irias_object.h>
 
 #define NET_IRDA 412 /* Random number */
@@ -52,10 +52,6 @@ extern int  sysctl_max_tx_window;
 extern int  sysctl_max_noreply_time;
 extern int  sysctl_warn_noreply_time;
 extern int  sysctl_lap_keepalive_time;
-
-#ifdef CONFIG_IRDA_DEBUG
-extern unsigned int irda_debug;
-#endif
 
 /* this is needed for the proc_dointvec_minmax - Jean II */
 static int max_discovery_slots = 16;		/* ??? */