Advertisement
Guest User

Untitled

a guest
Sep 22nd, 2013
401
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.06 KB | None | 0 0
  1. diff -ru linux-3.10.12/drivers/net/wireless/rt2x00/rt2x00queue.c build_dir/target-mipsel_dsp_uClibc-0.9.33.2/linux-ramips_rt305x/linux-3.10.12/drivers/net/wireless/rt2x00/rt2x00queue.c
  2. --- linux-3.10.12/drivers/net/wireless/rt2x00/rt2x00queue.c 2013-09-14 17:55:12.000000000 +0400
  3. +++ build_dir/target-mipsel_dsp_uClibc-0.9.33.2/linux-ramips_rt305x/linux-3.10.12/drivers/net/wireless/rt2x00/rt2x00queue.c 2013-09-22 15:46:43.482533962 +0400
  4. @@ -645,6 +645,11 @@
  5. int ret = 0;
  6.  
  7. /*
  8. + * That function must be called with bh disabled.
  9. + */
  10. + spin_lock(&queue->tx_lock);
  11. +
  12. + /*
  13. * Copy all TX descriptor information into txdesc,
  14. * after that we are free to use the skb->cb array
  15. * for our information.
  16. @@ -693,11 +698,6 @@
  17. else if (test_bit(REQUIRE_DMA, &queue->rt2x00dev->cap_flags))
  18. rt2x00queue_align_frame(skb);
  19.  
  20. - /*
  21. - * That function must be called with bh disabled.
  22. - */
  23. - spin_lock(&queue->tx_lock);
  24. -
  25. if (unlikely(rt2x00queue_full(queue))) {
  26. rt2x00_err(queue->rt2x00dev, "Dropping frame due to full tx queue %d\n",
  27. queue->qid);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement