devices/e1000e/netdev-2.6.34-ethercat.c
branchstable-1.5
changeset 2472 50b861e981f7
parent 2421 bc2d4bf9cbe5
child 2473 f62b64fdbc23
equal deleted inserted replaced
2471:fc64a4b1ec1a 2472:50b861e981f7
  4147 
  4147 
  4148 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  4148 static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
  4149 {
  4149 {
  4150 	struct e1000_adapter *adapter = netdev_priv(netdev);
  4150 	struct e1000_adapter *adapter = netdev_priv(netdev);
  4151 
  4151 
       
  4152 	if (adapter->ecdev) {
       
  4153 		return -EBUSY;
       
  4154 	}
       
  4155 
  4152 	netif_stop_queue(netdev);
  4156 	netif_stop_queue(netdev);
  4153 	/*
  4157 	/*
  4154 	 * Herbert's original patch had:
  4158 	 * Herbert's original patch had:
  4155 	 *  smp_mb__after_netif_stop_queue();
  4159 	 *  smp_mb__after_netif_stop_queue();
  4156 	 * but since that doesn't exist yet, just open code it.
  4160 	 * but since that doesn't exist yet, just open code it.