devices/e1000/e1000_main-2.6.31-ethercat.c
branchstable-1.5
changeset 2471 fc64a4b1ec1a
parent 2469 634ba3b1eb95
child 2582 87e502828b3f
equal deleted inserted replaced
2470:4f97d61a8671 2471:fc64a4b1ec1a
  3260 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  3260 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  3261 {
  3261 {
  3262 	struct e1000_adapter *adapter = netdev_priv(netdev);
  3262 	struct e1000_adapter *adapter = netdev_priv(netdev);
  3263 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
  3263 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
  3264 
  3264 
       
  3265 	if (adapter->ecdev) {
       
  3266 		return -EBUSY;
       
  3267 	}
       
  3268 
  3265 	netif_stop_queue(netdev);
  3269 	netif_stop_queue(netdev);
  3266 	/* Herbert's original patch had:
  3270 	/* Herbert's original patch had:
  3267 	 *  smp_mb__after_netif_stop_queue();
  3271 	 *  smp_mb__after_netif_stop_queue();
  3268 	 * but since that doesn't exist yet, just open code it. */
  3272 	 * but since that doesn't exist yet, just open code it. */
  3269 	smp_mb();
  3273 	smp_mb();