]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
rt2x00: remove queue_entry from skbdesc
authorStanislaw Gruszka <sgruszka@redhat.com>
Wed, 8 Feb 2017 12:51:31 +0000 (13:51 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 8 Feb 2017 15:30:20 +0000 (17:30 +0200)
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
drivers/net/wireless/ralink/rt2x00/rt2x00queue.h

index 380daf4e1b8dc09e6c2cc8b18c041bb34688ee31..e1660b92b20c7793c88ea5d470e1d793f495bbf6 100644 (file)
@@ -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.
index 2233b911a1d7d7c5992db5681dcc1907d9719769..22d18818e85004261bbc6c8e6c63d6c8208058ac 100644 (file)
@@ -116,8 +116,6 @@ struct skb_frame_desc {
        __le32 iv[2];
 
        dma_addr_t skb_dma;
-
-       struct queue_entry *entry;
 };
 
 /**