devices/e1000/e1000_main-2.6.37-ethercat.c
branchstable-1.5
changeset 2471 fc64a4b1ec1a
parent 2469 634ba3b1eb95
child 2582 87e502828b3f
equal deleted inserted replaced
2470:4f97d61a8671 2471:fc64a4b1ec1a
  3073 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  3073 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  3074 {
  3074 {
  3075 	struct e1000_adapter *adapter = netdev_priv(netdev);
  3075 	struct e1000_adapter *adapter = netdev_priv(netdev);
  3076 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
  3076 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
  3077 
  3077 
       
  3078 	if (adapter->ecdev) {
       
  3079 		return -EBUSY;
       
  3080 	}
       
  3081 
  3078 	netif_stop_queue(netdev);
  3082 	netif_stop_queue(netdev);
  3079 	/* Herbert's original patch had:
  3083 	/* Herbert's original patch had:
  3080 	 *  smp_mb__after_netif_stop_queue();
  3084 	 *  smp_mb__after_netif_stop_queue();
  3081 	 * but since that doesn't exist yet, just open code it. */
  3085 	 * but since that doesn't exist yet, just open code it. */
  3082 	smp_mb();
  3086 	smp_mb();