From 5d957cf736e20da56c06741fd7f64ba108783ce9 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sun, 4 Oct 2015 23:22:49 -0300
Subject: linux-libre-knock-4.2.3_gnu-1: updating version

---
 .../0001-fix-bridge-regression.patch               | 25 ----------------------
 kernels/linux-libre-knock/PKGBUILD                 | 10 ++-------
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 kernels/linux-libre-knock/0001-fix-bridge-regression.patch

diff --git a/kernels/linux-libre-knock/0001-fix-bridge-regression.patch b/kernels/linux-libre-knock/0001-fix-bridge-regression.patch
deleted file mode 100644
index 250dfcbcf..000000000
--- a/kernels/linux-libre-knock/0001-fix-bridge-regression.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-@@ -, +, @@ 
----
- net/bridge/br_multicast.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
---- a/net/bridge/br_multicast.c	
-+++ a/net/bridge/br_multicast.c	
-@@ -991,7 +991,7 @@ static int br_ip4_multicast_igmp3_report(struct net_bridge *br,
- 
- 	ih = igmpv3_report_hdr(skb);
- 	num = ntohs(ih->ngrec);
--	len = sizeof(*ih);
-+	len = skb_transport_offset(skb) + sizeof(*ih);
- 
- 	for (i = 0; i < num; i++) {
- 		len += sizeof(*grec);
-@@ -1052,7 +1052,7 @@ static int br_ip6_multicast_mld2_report(struct net_bridge *br,
- 
- 	icmp6h = icmp6_hdr(skb);
- 	num = ntohs(icmp6h->icmp6_dataun.un_data16[1]);
--	len = sizeof(*icmp6h);
-+	len = skb_transport_offset(skb) + sizeof(*icmp6h);
- 
- 	for (i = 0; i < num; i++) {
- 		__be16 *nsrcs, _nsrcs;
--- 
diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD
index 24236b437..d5096202b 100644
--- a/kernels/linux-libre-knock/PKGBUILD
+++ b/kernels/linux-libre-knock/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgbase=linux-libre-knock
 _pkgbasever=4.2-gnu
-_pkgver=4.2.2-gnu
+_pkgver=4.2.3-gnu
 _knockpatchver=4.2_2
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -51,7 +51,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         'change-default-console-loglevel.patch'
         '0001-e1000e-Fix-tight-loop-implementation-of-systime-read.patch'
         '0001-netfilter-conntrack-use-nf_ct_tmpl_free-in-CT-synpro.patch'
-        '0001-fix-bridge-regression.patch'
         '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch'
         # armv7h patches
         "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
@@ -66,7 +65,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '0008-USB-armory-support.patch')
 sha256sums=('3a8fc9da5a38f15cc4ed0c5132d05b8245dfc1007c37e7e1994b2486535ecf49'
             'SKIP'
-            '384ec01921dd2cee4af181ad53ceb313da5deaa6040e4ac625f6fb58dd264ed5'
+            '9e452d470bd33ea9cdbab5a285bea8c5b4ac91087ffb154e65c32c360a9a53f1'
             'SKIP'
             'c7c4ab580f00dca4114c185812a963e73217e6bf86406c240d669026dc3f98a4'
             'SKIP'
@@ -83,7 +82,6 @@ sha256sums=('3a8fc9da5a38f15cc4ed0c5132d05b8245dfc1007c37e7e1994b2486535ecf49'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '0b1e41ba59ae45f5929963aa22fdc53bc8ffb4534e976cec046269d1a462197b'
             '6ed9e31ae5614c289c4884620e45698e764c03670ebc45bab9319d741238cbd3'
-            '0a8fe4434e930d393c7983e335842f6cb77ee263af5592a0ca7e14bae7296183'
             '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d'
             '4b9ad713f1520c1eedba88e1e504c9c9bf3b832b0a40fd6566d107895fbd6b67'
             'SKIP'
@@ -151,10 +149,6 @@ prepare() {
   # many instances of this error: nf_conntrack: table full, dropping packet
   patch -p1 -i "${srcdir}/0001-netfilter-conntrack-use-nf_ct_tmpl_free-in-CT-synpro.patch"
 
-  # add not-yes-mainlined patch to fix bridge code
-  # https://bugzilla.kernel.org/show_bug.cgi?id=104161
-  patch -Np1 -i "${srcdir}/0001-fix-bridge-regression.patch"
-
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
-- 
cgit v1.2.3-54-g00ecf