patch-2.1.32 linux/net/ax25/ax25_dev.c

Next file: linux/net/bridge/Makefile
Previous file: linux/net/ax25/af_ax25.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.31/linux/net/ax25/ax25_dev.c linux/net/ax25/ax25_dev.c
@@ -81,7 +81,9 @@
 		return;
 	}
 
+#ifdef CONFIG_SYSCTL
 	ax25_unregister_sysctl();
+#endif
 
 	memset(ax25_dev, 0x00, sizeof(*ax25_dev));
 
@@ -112,7 +114,9 @@
 	ax25_dev_list  = ax25_dev;
 	restore_flags(flags);
 
+#ifdef CONFIG_SYSCTL
 	ax25_register_sysctl();
+#endif
 }
 
 void ax25_dev_device_down(struct device *dev)
@@ -123,7 +127,9 @@
 	if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL)
 		return;
 
+#ifdef CONFIG_SYSCTL
 	ax25_unregister_sysctl();
+#endif
 
 	save_flags(flags); cli();
 
@@ -142,7 +148,9 @@
 		ax25_dev_list = s->next;
 		restore_flags(flags);
 		kfree_s(ax25_dev, sizeof(ax25_dev));
+#ifdef CONFIG_SYSCTL
 		ax25_register_sysctl();
+#endif
 		return;
 	}
 
@@ -151,7 +159,9 @@
 			s->next = ax25_dev->next;
 			restore_flags(flags);
 			kfree_s(ax25_dev, sizeof(ax25_dev));
+#ifdef CONFIG_SYSCTL
 			ax25_register_sysctl();
+#endif
 			return;
 		}
 
@@ -159,7 +169,9 @@
 	}
 
 	restore_flags(flags);
+#ifdef CONFIG_SYSCTL
 	ax25_register_sysctl();
+#endif
 }
 
 int ax25_fwd_ioctl(unsigned int cmd, struct ax25_fwd_struct *fwd)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov