1
0

020-06-rt2x00-remove-queue_entry-from-skbdesc.patch 1.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859
  1. From cf81db30a6edcca791b1bfa5348a162471121d11 Mon Sep 17 00:00:00 2001
  2. From: Stanislaw Gruszka <sgruszka@redhat.com>
  3. Date: Wed, 8 Feb 2017 13:51:31 +0100
  4. Subject: [PATCH 06/19] rt2x00: remove queue_entry from skbdesc
  5. queue_entry field of skbdesc is not read any more, remove it to allow
  6. skbdesc contain other data.
  7. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
  8. Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  9. ---
  10. drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 3 ---
  11. drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 2 --
  12. 2 files changed, 5 deletions(-)
  13. diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
  14. index 380daf4e1b8d..e1660b92b20c 100644
  15. --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
  16. +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
  17. @@ -83,7 +83,6 @@ struct sk_buff *rt2x00queue_alloc_rxskb(struct queue_entry *entry, gfp_t gfp)
  18. */
  19. skbdesc = get_skb_frame_desc(skb);
  20. memset(skbdesc, 0, sizeof(*skbdesc));
  21. - skbdesc->entry = entry;
  22. if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_DMA)) {
  23. dma_addr_t skb_dma;
  24. @@ -689,7 +688,6 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
  25. goto out;
  26. }
  27. - skbdesc->entry = entry;
  28. entry->skb = skb;
  29. /*
  30. @@ -774,7 +772,6 @@ int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev,
  31. */
  32. skbdesc = get_skb_frame_desc(intf->beacon->skb);
  33. memset(skbdesc, 0, sizeof(*skbdesc));
  34. - skbdesc->entry = intf->beacon;
  35. /*
  36. * Send beacon to hardware.
  37. diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
  38. index 2233b911a1d7..22d18818e850 100644
  39. --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
  40. +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
  41. @@ -116,8 +116,6 @@ struct skb_frame_desc {
  42. __le32 iv[2];
  43. dma_addr_t skb_dma;
  44. -
  45. - struct queue_entry *entry;
  46. };
  47. /**
  48. --
  49. 2.12.1