patch-2.3.14 linux/drivers/net/arlan-proc.c

Next file: linux/drivers/net/arlan.c
Previous file: linux/drivers/net/ariadne2.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/drivers/net/arlan-proc.c linux/drivers/net/arlan-proc.c
@@ -7,10 +7,10 @@
 #include <linux/sysctl.h>
 #include <linux/version.h>
 
-/* void enableReceive(struct device* dev);
+/* void enableReceive(struct net_device* dev);
 */
 
-static  int	arlan_command(struct device * dev, int command);
+static  int	arlan_command(struct net_device * dev, int command);
 
 
 #define ARLAN_STR_SIZE 	0x2ff0
@@ -58,7 +58,7 @@
 }
 
 
-const char *arlan_diagnostic_info_string(struct device *dev)
+const char *arlan_diagnostic_info_string(struct net_device *dev)
 {
 
 	volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card;
@@ -113,7 +113,7 @@
 	  }
 };
 
-static const char *arlan_hardware_type_string(struct device *dev)
+static const char *arlan_hardware_type_string(struct net_device *dev)
 {
 	u_char hardwareType;
 	volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card;
@@ -186,7 +186,7 @@
 	}
 }
 
-static void arlan_print_diagnostic_info(struct device *dev)
+static void arlan_print_diagnostic_info(struct net_device *dev)
 {
 	int i;
 	u_char diagnosticInfo;
@@ -251,7 +251,7 @@
 
 /******************************		TEST 	MEMORY	**************/
 
-static int arlan_hw_test_memory(struct device *dev)
+static int arlan_hw_test_memory(struct net_device *dev)
 {
 	u_char *ptr;
 	int i;
@@ -320,7 +320,7 @@
 }
 
 
-static int arlan_setup_card_by_book(struct device *dev)
+static int arlan_setup_card_by_book(struct net_device *dev)
 {
 	u_char irqLevel, configuredStatusFlag;
 	volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card;
@@ -408,7 +408,7 @@
 	int i;
 	int retv, pos, devnum;
 	struct arlan_private *priva = NULL;
-	struct device *dev;
+	struct net_device *dev;
 	pos = 0;
 	if (write)
 	{

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)