devices/e1000/e1000_main-2.6.32-ethercat.c
branchstable-1.5
changeset 2471 fc64a4b1ec1a
parent 2469 634ba3b1eb95
child 2582 87e502828b3f
equal deleted inserted replaced
2470:4f97d61a8671 2471:fc64a4b1ec1a
  2949 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  2949 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  2950 {
  2950 {
  2951 	struct e1000_adapter *adapter = netdev_priv(netdev);
  2951 	struct e1000_adapter *adapter = netdev_priv(netdev);
  2952 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
  2952 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
  2953 
  2953 
       
  2954 	if (adapter->ecdev) {
       
  2955 		return -EBUSY;
       
  2956 	}
       
  2957 
  2954 	netif_stop_queue(netdev);
  2958 	netif_stop_queue(netdev);
  2955 	/* Herbert's original patch had:
  2959 	/* Herbert's original patch had:
  2956 	 *  smp_mb__after_netif_stop_queue();
  2960 	 *  smp_mb__after_netif_stop_queue();
  2957 	 * but since that doesn't exist yet, just open code it. */
  2961 	 * but since that doesn't exist yet, just open code it. */
  2958 	smp_mb();
  2962 	smp_mb();