package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch

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