devices/e1000/e1000_main-2.6.22-ethercat.c
branchstable-1.5
changeset 2471 fc64a4b1ec1a
parent 2421 bc2d4bf9cbe5
child 2582 87e502828b3f
equal deleted inserted replaced
2470:4f97d61a8671 2471:fc64a4b1ec1a
  3290 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  3290 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  3291 {
  3291 {
  3292 	struct e1000_adapter *adapter = netdev_priv(netdev);
  3292 	struct e1000_adapter *adapter = netdev_priv(netdev);
  3293 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
  3293 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
  3294 
  3294 
       
  3295 	if (adapter->ecdev) {
       
  3296 		return -EBUSY;
       
  3297 	}
       
  3298 
  3295 	netif_stop_queue(netdev);
  3299 	netif_stop_queue(netdev);
  3296 	/* Herbert's original patch had:
  3300 	/* Herbert's original patch had:
  3297 	 *  smp_mb__after_netif_stop_queue();
  3301 	 *  smp_mb__after_netif_stop_queue();
  3298 	 * but since that doesn't exist yet, just open code it. */
  3302 	 * but since that doesn't exist yet, just open code it. */
  3299 	smp_mb();
  3303 	smp_mb();