SHARE
TWEET

Untitled

a guest Aug 24th, 2012 30 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. drivers/net/ethernet/atheros/atl1c/atl1c.h | 1 -
  2. drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 10 -
  3. 2 files changed, 11 deletions(-)
  4.  
  5. diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h
  6. index ca70e16..3b2851b 100644
  7. a/drivers/net/ethernet/atheros/atl1c/atl1c.h
  8. +++ b/drivers/net/ethernet/atheros/atl1c/atl1c.h
  9. @@ -576,7 +576,6 @@ struct atl1c_adapter {
  10. u16 link_duplex;
  11.  
  12. spinlock_t mdio_lock;
  13. - spinlock_t tx_lock;
  14. atomic_t irq_sem;
  15.  
  16. struct work_struct common_task;
  17. diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
  18. index 1ff3c6d..3dde956 100644
  19. a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
  20. +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
  21. @@ -784,7 +784,6 @@ static int __devinit atl1c_sw_init(struct atl1c_adapter *adapter)
  22. atl1c_set_rxbufsize(adapter, adapter->netdev);
  23. atomic_set(&adapter->irq_sem, 1);
  24. spin_lock_init(&adapter->mdio_lock);
  25. - spin_lock_init(&adapter->tx_lock);
  26. set_bit(__AT_DOWN, &adapter->flags);
  27.  
  28. return 0;
  29. @@ -2228,7 +2227,6 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,
  30. struct net_device *netdev)
  31. {
  32. struct atl1c_adapter *adapter = netdev_priv(netdev);
  33. - unsigned long flags;
  34. u16 tpd_req = 1;
  35. struct atl1c_tpd_desc *tpd;
  36. enum atl1c_trans_queue type = atl1c_trans_normal;
  37. @@ -2239,16 +2237,10 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,
  38. }
  39.  
  40. tpd_req = atl1c_cal_tpd_req(skb);
  41. - if (!spin_trylock_irqsave(&adapter->tx_lock, flags)) {
  42. - if (netif_msg_pktdata(adapter))
  43. - dev_info(&adapter->pdev->dev, "tx locked");
  44. - return NETDEV_TX_LOCKED;
  45. - }
  46.  
  47. if (atl1c_tpd_avail(adapter, type) < tpd_req) {
  48. /* no enough descriptor, just stop queue */
  49. netif_stop_queue(netdev);
  50. - spin_unlock_irqrestore(&adapter->tx_lock, flags);
  51. return NETDEV_TX_BUSY;
  52. }
  53.  
  54. @@ -2256,7 +2248,6 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,
  55.  
  56. /* do TSO and check sum */
  57. if (atl1c_tso_csum(adapter, skb, &tpd, type) != 0) {
  58. - spin_unlock_irqrestore(&adapter->tx_lock, flags);
  59. dev_kfree_skb_any(skb);
  60. return NETDEV_TX_OK;
  61. }
  62. @@ -2277,7 +2268,6 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,
  63. atl1c_tx_map(adapter, skb, tpd, type);
  64. atl1c_tx_queue(adapter, skb, tpd, type);
  65.  
  66. - spin_unlock_irqrestore(&adapter->tx_lock, flags);
  67. return NETDEV_TX_OK;
  68. }
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top