etherlabmaster: comparison devices/e1000e/netdev-2.6.34-ethercat.c

equal deleted inserted replaced

-:af21f0bdc7c9
+:2b9c78543663
 Contact Information:
 Linux NICS <linux.nics@intel.com>
 e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
 Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+vim: noexpandtab
 *******************************************************************************/
 #include <linux/module.h>
 #include <linux/types.h>
 	struct net_device *netdev = data;
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_hw *hw = &adapter->hw;
 	u32 icr = er32(ICR);
 	if (adapter->ecdev) {
 		int ec_work_done = 0;
 		adapter->clean_rx(adapter, &ec_work_done, 100);
 		e1000_clean_tx_irq(adapter);
 		return IRQ_HANDLED;
 	}
 	/*
 	 * read ICR disables interrupts using IAM
 	 */
 		/* guard against interrupt when we're going down */
 		if (!test_bit(__E1000_DOWN, &adapter->state))
 			mod_timer(&adapter->watchdog_timer, jiffies + 1);
 	}
 	if (adapter->ecdev) {
 		int ec_work_done = 0;
 		adapter->clean_rx(adapter, &ec_work_done, 100);
 		e1000_clean_tx_irq(adapter);
 		return IRQ_HANDLED;
 	}
 	if (napi_schedule_prep(&adapter->napi)) {
 		adapter->total_tx_bytes = 0;
 		writel(1000000000 / (adapter->rx_ring->itr_val * 256),
 		       adapter->hw.hw_addr + adapter->rx_ring->itr_register);
 		adapter->rx_ring->set_itr = 0;
 	}
 	if (adapter->ecdev) {
 		int ec_work_done = 0;
 		adapter->clean_rx(adapter, &ec_work_done, 100);
 	} else {
 		if (napi_schedule_prep(&adapter->napi)) {
 			adapter->total_rx_bytes = 0;
 			adapter->total_rx_packets = 0;
 			__napi_schedule(&adapter->napi);
 	/* hardware has been reset, we need to reload some things */
 	e1000_configure(adapter);
 	clear_bit(__E1000_DOWN, &adapter->state);
 	if (!adapter->ecdev)
 		napi_enable(&adapter->napi);
 	if (adapter->msix_entries)
 		e1000_configure_msix(adapter);
 	/* disable receives in the hardware */
 	rctl = er32(RCTL);
 	ew32(RCTL, rctl & ~E1000_RCTL_EN);
 	/* flush and sleep below */
 	if (!adapter->ecdev)
 		netif_stop_queue(netdev);
 	/* disable transmits in the hardware */
 	tctl = er32(TCTL);
 	tctl &= ~E1000_TCTL_EN;
 	}
 	/* From here on the code is the same as e1000e_up() */
 	clear_bit(__E1000_DOWN, &adapter->state);
-	napi_enable(&adapter->napi);
+	if (!adapter->ecdev) {
+		napi_enable(&adapter->napi);
-	e1000_irq_enable(adapter);
+		e1000_irq_enable(adapter);
-	netif_start_queue(netdev);
+		netif_start_queue(netdev);
+	}
 	/* fire a link status change interrupt to start the watchdog */
 	ew32(ICS, E1000_ICS_LSC);
 	return 0;
 	if ((e1000e_enable_tx_pkt_filtering(hw)) &&
 	    (adapter->mng_vlan_id != adapter->hw.mng_cookie.vlan_id))
 		e1000_update_mng_vlan(adapter);
 	if (link) {
 		if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
 				|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
 			bool txb2b = 1;
 			/* update snapshot of PHY registers on LSC */
 			e1000_phy_read_status(adapter);
 			mac->ops.get_link_up_info(&adapter->hw,
 			if (phy->ops.cfg_on_link_up)
 				phy->ops.cfg_on_link_up(hw);
 			if (adapter->ecdev)
 				ecdev_set_link(adapter->ecdev, 1);
 			else
 				netif_carrier_on(netdev);
 			if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
 				mod_timer(&adapter->phy_info_timer,
 					  round_jiffies(jiffies + 2 * HZ));
 		}
 	} else {
 		if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
 				|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
 			adapter->link_speed = 0;
 			adapter->link_duplex = 0;
 			/* Link status message must follow this format */
 			printk(KERN_INFO "e1000e: %s NIC Link is Down\n",
 	adapter->gotc = adapter->stats.gotc - adapter->gotc_old;
 	adapter->gotc_old = adapter->stats.gotc;
 	e1000e_update_adaptive(&adapter->hw);
-	if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
+	if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
-			|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
 		tx_pending = (e1000_desc_unused(tx_ring) + 1 <
 			       tx_ring->count);
 		if (tx_pending) {
 			/*
 			 * We've lost link, so the controller stops DMA,
 }
 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
 static void e1000_shutdown(struct pci_dev *pdev)
 {
 	bool wake = false;
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	if (adapter->ecdev)
 		return;
 	__e1000_shutdown(pdev, &wake);
 	if (!(adapter->flags & FLAG_HAS_AMT))
 		e1000_get_hw_control(adapter);
 	adapter->ecdev = ecdev_offer(netdev,ec_poll,THIS_MODULE);
 	if (adapter->ecdev) {
-		if (ecdev_open(adapter->ecdev)) {
+		err = ecdev_open(adapter->ecdev);
+		if (err) {
 			ecdev_withdraw(adapter->ecdev);
 			goto err_register;
 		}
 	} else {
 		strcpy(netdev->name, "eth%d");

changeset 2589	2b9c78543663
parent 2076	1baafcd263cc