[PATCH 3/3] rt2x00: remove queue_entry from skbdesc

2017-02-08 Thread Stanislaw Gruszka 
queue_entry field of skbdesc is not read any more, remove it to allow
skbdesc contain other data.

Signed-off-by: Stanislaw Gruszka 
---
 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 380daf4..e1660b9 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 2233b91..22d1881 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;
 };
 
 /**
-- 
1.8.3.1

Re: [PATCH 3/3] rt2x00: remove queue_entry from skbdesc

2017-02-09 Thread Jeroen Roovers 
On 8 February 2017 at 13:51, Stanislaw Gruszka  wrote:

> diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h 
> b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
> index 2233b91..22d1881 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;
>  };
>
>  /**

That change needs this line removed above:

 * @entry: The entry to which this sk buffer belongs.


Cheers.
 jer

Re: [PATCH 3/3] rt2x00: remove queue_entry from skbdesc

2017-02-09 Thread Stanislaw Gruszka 
On Thu, Feb 09, 2017 at 04:00:19PM +0100, Jeroen Roovers wrote:
> On 8 February 2017 at 13:51, Stanislaw Gruszka  wrote:
> 
> > diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h 
> > b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
> > index 2233b91..22d1881 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;
> >  };
> >
> >  /**
> 
> That change needs this line removed above:
> 
>  * @entry: The entry to which this sk buffer belongs.

Thanks, I will fix comments when post next rt2x00 patch series.

Stanislaw