[linux] 02/04: Delete unused patches

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy-security
in repository linux.

commit b41def693bcb6f4989b9ce03a4cb0ea5437dfffe
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Jun 16 00:41:36 2016 +0100

    Delete unused patches
---
 .../features/all/define-netdev_features_t.patch    |  18 ----
 ...ter-Allow-to-create-sk-unattached-filters.patch | 120 ---------------------
 2 files changed, 138 deletions(-)

diff --git a/debian/patches/features/all/define-netdev_features_t.patch b/debian/patches/features/all/define-netdev_features_t.patch
deleted file mode 100644
index b11cc2e..0000000
--- a/debian/patches/features/all/define-netdev_features_t.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Ben Hutchings <ben at decadent.org.uk>
-Subject: Define netdev_features_t
-
-This was done in upstream commit
-c8f44affb7244f2ac3e703cab13d55ede27621bb, but we just want the type
-definition for use by backported drivers rather than changing
-everything to use it.
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -950,6 +950,8 @@
- 						    u32 features);
- };
- 
-+typedef u32 netdev_features_t;
-+
- /*
-  *	The DEVICE structure.
-  *	Actually, this whole structure is a big mistake.  It mixes I/O
diff --git a/debian/patches/features/all/filter-Allow-to-create-sk-unattached-filters.patch b/debian/patches/features/all/filter-Allow-to-create-sk-unattached-filters.patch
deleted file mode 100644
index f3fb977..0000000
--- a/debian/patches/features/all/filter-Allow-to-create-sk-unattached-filters.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From: Jiri Pirko <jpirko at redhat.com>
-Date: Sat, 31 Mar 2012 11:01:19 +0000
-Subject: filter: Allow to create sk-unattached filters
-
-commit 302d663740cfaf2c364df6bb61cd339014ed714c upstream.
-
-Today, BPF filters are bind to sockets. Since BPF machine becomes handy
-for other purposes, this patch allows to create unattached filter.
-
-Signed-off-by: Jiri Pirko <jpirko at redhat.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
----
- include/linux/filter.h |    3 +++
- net/core/filter.c      |   66 +++++++++++++++++++++++++++++++++++++++++++++---
- 2 files changed, 65 insertions(+), 4 deletions(-)
-
-diff --git a/include/linux/filter.h b/include/linux/filter.h
-index 8eeb205..92dd993 100644
---- a/include/linux/filter.h
-+++ b/include/linux/filter.h
-@@ -153,6 +153,9 @@ static inline unsigned int sk_filter_len(const struct sk_filter *fp)
- extern int sk_filter(struct sock *sk, struct sk_buff *skb);
- extern unsigned int sk_run_filter(const struct sk_buff *skb,
- 				  const struct sock_filter *filter);
-+extern int sk_unattached_filter_create(struct sk_filter **pfp,
-+				       struct sock_fprog *fprog);
-+extern void sk_unattached_filter_destroy(struct sk_filter *fp);
- extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);
- extern int sk_detach_filter(struct sock *sk);
- extern int sk_chk_filter(struct sock_filter *filter, unsigned int flen);
-diff --git a/net/core/filter.c b/net/core/filter.c
-index 5dea452..cfbea88 100644
---- a/net/core/filter.c
-+++ b/net/core/filter.c
-@@ -587,6 +587,67 @@ void sk_filter_release_rcu(struct rcu_head *rcu)
- }
- EXPORT_SYMBOL(sk_filter_release_rcu);
- 
-+static int __sk_prepare_filter(struct sk_filter *fp)
-+{
-+	int err;
-+
-+	fp->bpf_func = sk_run_filter;
-+
-+	err = sk_chk_filter(fp->insns, fp->len);
-+	if (err)
-+		return err;
-+
-+	bpf_jit_compile(fp);
-+	return 0;
-+}
-+
-+/**
-+ *	sk_unattached_filter_create - create an unattached filter
-+ *	@fprog: the filter program
-+ *	@sk: the socket to use
-+ *
-+ * Create a filter independent ofr any socket. We first run some
-+ * sanity checks on it to make sure it does not explode on us later.
-+ * If an error occurs or there is insufficient memory for the filter
-+ * a negative errno code is returned. On success the return is zero.
-+ */
-+int sk_unattached_filter_create(struct sk_filter **pfp,
-+				struct sock_fprog *fprog)
-+{
-+	struct sk_filter *fp;
-+	unsigned int fsize = sizeof(struct sock_filter) * fprog->len;
-+	int err;
-+
-+	/* Make sure new filter is there and in the right amounts. */
-+	if (fprog->filter == NULL)
-+		return -EINVAL;
-+
-+	fp = kmalloc(fsize + sizeof(*fp), GFP_KERNEL);
-+	if (!fp)
-+		return -ENOMEM;
-+	memcpy(fp->insns, fprog->filter, fsize);
-+
-+	atomic_set(&fp->refcnt, 1);
-+	fp->len = fprog->len;
-+
-+	err = __sk_prepare_filter(fp);
-+	if (err)
-+		goto free_mem;
-+
-+	*pfp = fp;
-+	return 0;
-+free_mem:
-+	kfree(fp);
-+	return err;
-+}
-+EXPORT_SYMBOL_GPL(sk_unattached_filter_create);
-+
-+void sk_unattached_filter_destroy(struct sk_filter *fp)
-+{
-+	sk_filter_release(fp);
-+}
-+EXPORT_SYMBOL_GPL(sk_unattached_filter_destroy);
-+
- /**
-  *	sk_attach_filter - attach a socket filter
-  *	@fprog: the filter program
-@@ -617,16 +678,13 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
- 
- 	atomic_set(&fp->refcnt, 1);
- 	fp->len = fprog->len;
--	fp->bpf_func = sk_run_filter;
- 
--	err = sk_chk_filter(fp->insns, fp->len);
-+	err = __sk_prepare_filter(fp);
- 	if (err) {
- 		sk_filter_uncharge(sk, fp);
- 		return err;
- 	}
- 
--	bpf_jit_compile(fp);
--
- 	old_fp = rcu_dereference_protected(sk->sk_filter,
- 					   sock_owned_by_user(sk));
- 	rcu_assign_pointer(sk->sk_filter, fp);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git