1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859 |
- From cf81db30a6edcca791b1bfa5348a162471121d11 Mon Sep 17 00:00:00 2001
- From: Stanislaw Gruszka <sgruszka@redhat.com>
- Date: Wed, 8 Feb 2017 13:51:31 +0100
- Subject: [PATCH 06/19] rt2x00: remove queue_entry from skbdesc
- queue_entry field of skbdesc is not read any more, remove it to allow
- skbdesc contain other data.
- Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
- Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ---
- drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 3 ---
- drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 2 --
- 2 files changed, 5 deletions(-)
- diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
- index 380daf4e1b8d..e1660b92b20c 100644
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
- @@ -83,7 +83,6 @@ struct sk_buff *rt2x00queue_alloc_rxskb(struct queue_entry *entry, gfp_t gfp)
- */
- skbdesc = get_skb_frame_desc(skb);
- memset(skbdesc, 0, sizeof(*skbdesc));
- - skbdesc->entry = entry;
-
- if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_DMA)) {
- dma_addr_t skb_dma;
- @@ -689,7 +688,6 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
- goto out;
- }
-
- - skbdesc->entry = entry;
- entry->skb = skb;
-
- /*
- @@ -774,7 +772,6 @@ int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev,
- */
- skbdesc = get_skb_frame_desc(intf->beacon->skb);
- memset(skbdesc, 0, sizeof(*skbdesc));
- - skbdesc->entry = intf->beacon;
-
- /*
- * Send beacon to hardware.
- diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
- index 2233b911a1d7..22d18818e850 100644
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
- @@ -116,8 +116,6 @@ struct skb_frame_desc {
- __le32 iv[2];
-
- dma_addr_t skb_dma;
- -
- - struct queue_entry *entry;
- };
-
- /**
- --
- 2.12.1
|