summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-02-17 00:03:09 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2016-02-18 22:15:08 +0100
commitbec4037a54dd0e1a1aeefe7385faf82bac44d6a0 (patch)
tree6930ea5479256c14e5ab9451f3dde09275ac7677
parent467aebfdc8593c11bc29c24d92bb8ed41009f31f (diff)
patches: refresh on v4.4.2v4.4.2-1linux-4.4.y
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.76 [ OK ] 4 3.3.8 [ OK ] 5 3.4.110 [ OK ] 6 3.5.7 [ OK ] 7 3.6.11 [ OK ] 8 3.7.10 [ OK ] 9 3.8.13 [ OK ] 10 3.9.11 [ OK ] 11 3.10.96 [ OK ] 12 3.11.10 [ OK ] 13 3.12.53 [ OK ] 14 3.13.11 [ OK ] 15 3.14.60 [ OK ] 16 3.15.10 [ OK ] 17 3.16.7 [ OK ] 18 3.17.8 [ OK ] 19 3.18.26 [ OK ] 20 3.19.8 [ OK ] 21 4.0.9 [ OK ] 22 4.1.17 [ OK ] 23 4.2.8 [ OK ] 24 4.3.5 [ OK ] 25 4.4.1 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/collateral-evolutions/media/0004-missing-include/hackrf.patch4
-rw-r--r--patches/collateral-evolutions/network/0028-select_queue/mac80211.patch4
-rw-r--r--patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch4
3 files changed, 6 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/media/0004-missing-include/hackrf.patch b/patches/collateral-evolutions/media/0004-missing-include/hackrf.patch
index c55ba889..dfc5a36e 100644
--- a/patches/collateral-evolutions/media/0004-missing-include/hackrf.patch
+++ b/patches/collateral-evolutions/media/0004-missing-include/hackrf.patch
@@ -6,5 +6,5 @@
#include <media/videobuf2-vmalloc.h>
+#include <linux/mm.h>
- /* HackRF USB API commands (from HackRF Library) */
- enum {
+ /*
+ * Used Avago MGA-81563 RF amplifier could be destroyed pretty easily with too
diff --git a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
index 92cb6ff0..d78d2cc8 100644
--- a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
+++ b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1096,10 +1096,20 @@ static void ieee80211_uninit(struct net_
+@@ -1097,10 +1097,20 @@ static void ieee80211_uninit(struct net_
ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
}
@@ -21,7 +21,7 @@
{
return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
}
-@@ -1145,10 +1155,20 @@ static const struct net_device_ops ieee8
+@@ -1146,10 +1156,20 @@ static const struct net_device_ops ieee8
.ndo_get_stats64 = ieee80211_get_stats64,
};
diff --git a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
index 6e242f78..4db5ea77 100644
--- a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
+++ b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
@@ -175,7 +175,7 @@
l2cap_chan_send(chan, &msg, 1 + len);
-@@ -3084,6 +3089,9 @@ static const struct l2cap_ops smp_chan_o
+@@ -3089,6 +3094,9 @@ static const struct l2cap_ops smp_chan_o
.suspend = l2cap_chan_no_suspend,
.set_shutdown = l2cap_chan_no_set_shutdown,
.get_sndtimeo = l2cap_chan_no_get_sndtimeo,
@@ -185,7 +185,7 @@
};
static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan)
-@@ -3132,6 +3140,9 @@ static const struct l2cap_ops smp_root_c
+@@ -3137,6 +3145,9 @@ static const struct l2cap_ops smp_root_c
.resume = l2cap_chan_no_resume,
.set_shutdown = l2cap_chan_no_set_shutdown,
.get_sndtimeo = l2cap_chan_no_get_sndtimeo,