[PATCH] 3c59x: minor cleanups (a880c4cd) · Commits · 戴 / test

drivers/net/3c59x.c

+34 −47

Original line number	Diff line number	Diff line
		@@ -900,7 +900,6 @@ static void acpi_set_WOL(struct net_device *dev);
		static struct ethtool_ops vortex_ethtool_ops;
		static void set_8021q_mode(struct net_device *dev, int enable);


		/* This driver uses 'options' to pass the media type, full-duplex flag, etc. */
		/* Option count limit only -- unlimited interfaces are supported. */
		#define MAX_UNITS 8
		@@ -915,8 +914,6 @@ static int global_full_duplex = -1;
		static int global_enable_wol = -1;
		static int global_use_mmio = -1;

		/* #define dev_alloc_skb dev_alloc_skb_debug */

		/* Variables to work-around the Compaq PCI BIOS32 problem. */
		static int compaq_ioaddr, compaq_irq, compaq_device_id = 0x5900;
		static struct net_device *compaq_net_device;
		@@ -1808,7 +1805,6 @@ vortex_up(struct net_device *dev)
		set_8021q_mode(dev, 1);
		iowrite16(StatsEnable, ioaddr + EL3_CMD); /* Turn on statistics. */

		// issue_and_wait(dev, SetTxStart\|0x07ff);
		iowrite16(RxEnable, ioaddr + EL3_CMD); /* Enable the receiver. */
		iowrite16(TxEnable, ioaddr + EL3_CMD); /* Enable transmitter. */
		/* Allow status bits to be seen. */
		@@ -3259,7 +3255,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val
		}
		return;
		}


		/* ACPI: Advanced Configuration and Power Interface. */
		/* Set Wake-On-LAN mode and put the board into D3 (power-down) state. */
		static void acpi_set_WOL(struct net_device *dev)
		@@ -3391,12 +3387,3 @@ static void __exit vortex_cleanup (void)

		module_init(vortex_init);
		module_exit(vortex_cleanup);


		/*
		* Local variables:
		* c-indent-level: 4
		* c-basic-offset: 4
		* tab-width: 4
		* End:
		*/

Admin message