devices/e1000/e1000_main-2.6.33-ethercat.c
branchstable-1.5
changeset 2471 fc64a4b1ec1a
parent 2469 634ba3b1eb95
child 2582 87e502828b3f
equal deleted inserted replaced
2470:4f97d61a8671 2471:fc64a4b1ec1a
  2973 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  2973 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  2974 {
  2974 {
  2975 	struct e1000_adapter *adapter = netdev_priv(netdev);
  2975 	struct e1000_adapter *adapter = netdev_priv(netdev);
  2976 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
  2976 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
  2977 
  2977 
       
  2978 	if (adapter->ecdev) {
       
  2979 		return -EBUSY;
       
  2980 	}
       
  2981 
  2978 	netif_stop_queue(netdev);
  2982 	netif_stop_queue(netdev);
  2979 	/* Herbert's original patch had:
  2983 	/* Herbert's original patch had:
  2980 	 *  smp_mb__after_netif_stop_queue();
  2984 	 *  smp_mb__after_netif_stop_queue();
  2981 	 * but since that doesn't exist yet, just open code it. */
  2985 	 * but since that doesn't exist yet, just open code it. */
  2982 	smp_mb();
  2986 	smp_mb();