devices/e1000/e1000_main-2.6.35-ethercat.c
branchstable-1.5
changeset 2471 fc64a4b1ec1a
parent 2469 634ba3b1eb95
child 2582 87e502828b3f
equal deleted inserted replaced
2470:4f97d61a8671 2471:fc64a4b1ec1a
  2987 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  2987 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  2988 {
  2988 {
  2989 	struct e1000_adapter *adapter = netdev_priv(netdev);
  2989 	struct e1000_adapter *adapter = netdev_priv(netdev);
  2990 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
  2990 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
  2991 
  2991 
       
  2992 	if (adapter->ecdev) {
       
  2993 		return -EBUSY;
       
  2994 	}
       
  2995 
       
  2996 
  2992 	netif_stop_queue(netdev);
  2997 	netif_stop_queue(netdev);
  2993 	/* Herbert's original patch had:
  2998 	/* Herbert's original patch had:
  2994 	 *  smp_mb__after_netif_stop_queue();
  2999 	 *  smp_mb__after_netif_stop_queue();
  2995 	 * but since that doesn't exist yet, just open code it. */
  3000 	 * but since that doesn't exist yet, just open code it. */
  2996 	smp_mb();
  3001 	smp_mb();