patch-2.4.11-dontuse linux/drivers/net/hamachi.c

• Lines: 29
• Date: Tue Oct 9 15:13:03 2001
• Orig file: v2.4.10/linux/drivers/net/hamachi.c
• Orig date: Mon Aug 27 12:41:42 2001

diff -u --recursive --new-file v2.4.10/linux/drivers/net/hamachi.c linux/drivers/net/hamachi.c
@@ -514,13 +514,15 @@
 	int mii_cnt;								/* MII device addresses. */
 	u16 advertising;							/* NWay media advertisement */
 	unsigned char phys[MII_CNT];		/* MII device addresses, only first one used. */
-	u_int32_t rx_int_var, tx_int_var;	/* interrupt control variables */
-	u_int32_t option;							/* Hold on to a copy of the options */
+	u32 rx_int_var, tx_int_var;	/* interrupt control variables */
+	u32 option;							/* Hold on to a copy of the options */
 	struct pci_dev *pci_dev;
 };
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>, Eric Kasten <kasten@nscl.msu.edu>, Keith Underwood <keithu@parl.clemson.edu>");
 MODULE_DESCRIPTION("Packet Engines 'Hamachi' GNIC-II Gigabit Ethernet driver");
+MODULE_LICENSE("GPL");
+
 MODULE_PARM(max_interrupt_work, "i");
 MODULE_PARM(mtu, "i");
 MODULE_PARM(debug, "i");
@@ -844,8 +846,8 @@
 	struct hamachi_private *hmp = dev->priv;
 	long ioaddr = dev->base_addr;
 	int i;
-	u_int32_t rx_int_var, tx_int_var;
-	u_int16_t fifo_info;
+	u32 rx_int_var, tx_int_var;
+	u16 fifo_info;
 
 	i = request_irq(dev->irq, &hamachi_interrupt, SA_SHIRQ, dev->name, dev);
 	if (i)