aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-06-10 15:30:31 +0200
committerFelix Fietkau <nbd@nbd.name>2017-06-17 11:51:41 +0200
commit45572fe831f94654af35316a365c51eb8a9cdeb8 (patch)
treea272e99019d5fd64d063ef48594b5f53bee204e1 /package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch
parent189239ade353636f9e2788cd0467bcca97bb9324 (diff)
downloadupstream-45572fe831f94654af35316a365c51eb8a9cdeb8.tar.gz
upstream-45572fe831f94654af35316a365c51eb8a9cdeb8.tar.bz2
upstream-45572fe831f94654af35316a365c51eb8a9cdeb8.zip
mac80211: refresh patches
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch')
-rw-r--r--package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch13
1 files changed, 3 insertions, 10 deletions
diff --git a/package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch b/package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch
index d8194acd23..c2ef9c1bb0 100644
--- a/package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch
+++ b/package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch
@@ -13,11 +13,9 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
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)
+@@ -83,7 +83,6 @@ struct sk_buff *rt2x00queue_alloc_rxskb(
*/
skbdesc = get_skb_frame_desc(skb);
memset(skbdesc, 0, sizeof(*skbdesc));
@@ -25,7 +23,7 @@ index 380daf4e1b8d..e1660b92b20c 100644
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,
+@@ -689,7 +688,6 @@ int rt2x00queue_write_tx_frame(struct da
goto out;
}
@@ -33,7 +31,7 @@ index 380daf4e1b8d..e1660b92b20c 100644
entry->skb = skb;
/*
-@@ -774,7 +772,6 @@ int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev,
+@@ -774,7 +772,6 @@ int rt2x00queue_update_beacon(struct rt2
*/
skbdesc = get_skb_frame_desc(intf->beacon->skb);
memset(skbdesc, 0, sizeof(*skbdesc));
@@ -41,8 +39,6 @@ index 380daf4e1b8d..e1660b92b20c 100644
/*
* 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 {
@@ -54,6 +50,3 @@ index 2233b911a1d7..22d18818e850 100644
};
/**
---
-2.12.1
-