From 2ced168dbd69b25809896c9f005b4143b2f66c44 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 25 Oct 2014 14:04:49 +0200 Subject: backports: refresh on v3.17.1 1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.62 [ OK ] 4 3.3.8 [ OK ] 5 3.4.104 [ 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.58 [ OK ] 12 3.11.10 [ OK ] 13 3.12.31 [ OK ] 14 3.13.11 [ OK ] 15 3.14.22 [ OK ] 16 3.15.10 [ OK ] 17 3.16.6 [ OK ] 18 3.17.1 [ OK ] Signed-off-by: Hauke Mehrtens --- .../media/0002-no_dmabuf/v4l2.patch | 24 +++++++++++----------- .../0006-ieee802154-6lowpan-namespace.patch | 13 +----------- .../network/0008-net-user-ns.patch | 4 ++-- .../network/0027-genl-const/nl80211.patch | 6 +++--- 4 files changed, 18 insertions(+), 29 deletions(-) diff --git a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch index a6f4bf5e..f9ef90a2 100644 --- a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch +++ b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch @@ -117,7 +117,7 @@ /* * Place the busy tests at the end: -EBUSY can be ignored when -@@ -1443,6 +1451,7 @@ err: +@@ -1442,6 +1450,7 @@ err: return ret; } @@ -125,7 +125,7 @@ /** * __qbuf_dmabuf() - handle qbuf of a DMABUF buffer */ -@@ -1560,6 +1569,7 @@ err: +@@ -1559,6 +1568,7 @@ err: return ret; } @@ -133,7 +133,7 @@ /** * __enqueue_in_driver() - enqueue a vb2_buffer in driver for processing -@@ -1640,9 +1650,11 @@ static int __buf_prepare(struct vb2_buff +@@ -1639,9 +1649,11 @@ static int __buf_prepare(struct vb2_buff up_read(mmap_sem); break; @@ -145,7 +145,7 @@ default: WARN(1, "Invalid queue type\n"); ret = -EINVAL; -@@ -2015,8 +2027,10 @@ EXPORT_SYMBOL_GPL(vb2_wait_for_all_buffe +@@ -2027,8 +2039,10 @@ EXPORT_SYMBOL_GPL(vb2_wait_for_all_buffe */ static void __vb2_dqbuf(struct vb2_buffer *vb) { @@ -156,7 +156,7 @@ /* nothing to do if the buffer is already dequeued */ if (vb->state == VB2_BUF_STATE_DEQUEUED) -@@ -2024,6 +2038,7 @@ static void __vb2_dqbuf(struct vb2_buffe +@@ -2036,6 +2050,7 @@ static void __vb2_dqbuf(struct vb2_buffe vb->state = VB2_BUF_STATE_DEQUEUED; @@ -164,7 +164,7 @@ /* unmap DMABUF buffer */ if (q->memory == V4L2_MEMORY_DMABUF) for (i = 0; i < vb->num_planes; ++i) { -@@ -2032,6 +2047,7 @@ static void __vb2_dqbuf(struct vb2_buffe +@@ -2044,6 +2059,7 @@ static void __vb2_dqbuf(struct vb2_buffe call_void_memop(vb, unmap_dmabuf, vb->planes[i].mem_priv); vb->planes[i].dbuf_mapped = 0; } @@ -172,7 +172,7 @@ } static int vb2_internal_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking) -@@ -2331,6 +2347,7 @@ static int __find_plane_by_offset(struct +@@ -2350,6 +2366,7 @@ static int __find_plane_by_offset(struct return -EINVAL; } @@ -180,7 +180,7 @@ /** * vb2_expbuf() - Export a buffer as a file descriptor * @q: videobuf2 queue -@@ -2408,6 +2425,7 @@ int vb2_expbuf(struct vb2_queue *q, stru +@@ -2427,6 +2444,7 @@ int vb2_expbuf(struct vb2_queue *q, stru return 0; } EXPORT_SYMBOL_GPL(vb2_expbuf); @@ -188,7 +188,7 @@ /** * vb2_mmap() - map video buffers into application address space -@@ -3331,6 +3349,7 @@ int vb2_ioctl_streamoff(struct file *fil +@@ -3357,6 +3375,7 @@ int vb2_ioctl_streamoff(struct file *fil } EXPORT_SYMBOL_GPL(vb2_ioctl_streamoff); @@ -196,7 +196,7 @@ int vb2_ioctl_expbuf(struct file *file, void *priv, struct v4l2_exportbuffer *p) { struct video_device *vdev = video_devdata(file); -@@ -3340,6 +3359,7 @@ int vb2_ioctl_expbuf(struct file *file, +@@ -3366,6 +3385,7 @@ int vb2_ioctl_expbuf(struct file *file, return vb2_expbuf(vdev->queue, p); } EXPORT_SYMBOL_GPL(vb2_ioctl_expbuf); @@ -363,7 +363,7 @@ void *(*vaddr)(void *buf_priv); void *(*cookie)(void *buf_priv); -@@ -453,7 +457,9 @@ void vb2_queue_release(struct vb2_queue +@@ -457,7 +461,9 @@ void vb2_queue_release(struct vb2_queue void vb2_queue_error(struct vb2_queue *q); int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b); @@ -373,7 +373,7 @@ int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking); int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type); -@@ -609,8 +615,10 @@ int vb2_ioctl_qbuf(struct file *file, vo +@@ -613,8 +619,10 @@ int vb2_ioctl_qbuf(struct file *file, vo int vb2_ioctl_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p); int vb2_ioctl_streamon(struct file *file, void *priv, enum v4l2_buf_type i); int vb2_ioctl_streamoff(struct file *file, void *priv, enum v4l2_buf_type i); diff --git a/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch b/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch index 609bf20f..bcf95445 100644 --- a/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch +++ b/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch @@ -16,7 +16,7 @@ idea yet. spin_lock(&fq->q.lock); -@@ -393,31 +397,55 @@ static int zero; +@@ -393,24 +397,44 @@ static int zero; static struct ctl_table lowpan_frags_ns_ctl_table[] = { { .procname = "6lowpanfrag_high_thresh", @@ -61,14 +61,3 @@ idea yet. .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_jiffies, - }, - { - .procname = "6lowpanfrag_max_datagram_size", -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) - .data = &init_net.ieee802154_lowpan.max_dsize, -+#else -+ .data = &ieee802154_lowpan.max_dsize, -+#endif - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec diff --git a/patches/collateral-evolutions/network/0008-net-user-ns.patch b/patches/collateral-evolutions/network/0008-net-user-ns.patch index d9cea85e..02ae368b 100644 --- a/patches/collateral-evolutions/network/0008-net-user-ns.patch +++ b/patches/collateral-evolutions/network/0008-net-user-ns.patch @@ -3,9 +3,9 @@ via commit 038e7332b8. --- a/net/ieee802154/reassembly.c +++ b/net/ieee802154/reassembly.c -@@ -491,9 +491,11 @@ static int __net_init lowpan_frags_ns_sy +@@ -479,9 +479,11 @@ static int __net_init lowpan_frags_ns_sy + table[1].extra2 = &ieee802154_lowpan->frags.high_thresh; table[2].data = &ieee802154_lowpan->frags.timeout; - table[3].data = &ieee802154_lowpan->max_dsize; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) /* Don't export sysctls to unprivileged users */ diff --git a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch index 0565390e..c0ead910 100644 --- a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch +++ b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch @@ -21,7 +21,7 @@ [NL80211_MCGRP_CONFIG] = { .name = "config", }, [NL80211_MCGRP_SCAN] = { .name = "scan", }, [NL80211_MCGRP_REGULATORY] = { .name = "regulatory", }, -@@ -9372,7 +9372,7 @@ static int nl80211_set_qos_map(struct sk +@@ -9378,7 +9378,7 @@ static int nl80211_set_qos_map(struct sk #define NL80211_FLAG_NEED_WDEV_UP (NL80211_FLAG_NEED_WDEV |\ NL80211_FLAG_CHECK_NETDEV_UP) @@ -30,7 +30,7 @@ struct genl_info *info) { struct cfg80211_registered_device *rdev; -@@ -9441,7 +9441,7 @@ static int nl80211_pre_doit(const struct +@@ -9447,7 +9447,7 @@ static int nl80211_pre_doit(const struct return 0; } @@ -39,7 +39,7 @@ struct genl_info *info) { if (info->user_ptr[1]) { -@@ -9458,7 +9458,7 @@ static void nl80211_post_doit(const stru +@@ -9464,7 +9464,7 @@ static void nl80211_post_doit(const stru rtnl_unlock(); } -- cgit v1.2.3