commit b00ece59d6a199f593546a77850bb8604787cec4
Author: Jan Rękorajski <[email protected]>
Date: Mon Feb 22 23:13:43 2021 +0100
- 5.4.99
kernel-atm-vbr.patch | 4 ++--
kernel-atmdd.patch | 2 +-
kernel-hostap.patch | 2 +-
kernel-layer7.patch | 10 +++++-----
kernel-pom-ng-IPV4OPTSSTRIP.patch | 4 ++--
kernel-rndis_host-wm5.patch | 6 +++---
kernel.spec | 4 ++--
7 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 9072ebda..b1720e2f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@
%define rel 1
%define basever 5.4
-%define postver .98
+%define postver .99
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -123,7 +123,7 @@ Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
# Source0-md5: ce9b2d974d27408a61c53a30d3f98fb9
%if "%{postver}" != ".0"
Patch0:
https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5: f3a4dc5e104dc851e8c2f55e8105ad53
+# Patch0-md5: aec30e37f0d963d46748ab295193e513
%endif
Source1: kernel.sysconfig
diff --git a/kernel-atm-vbr.patch b/kernel-atm-vbr.patch
index 28dc14b8..1bd2a4c5 100644
--- a/kernel-atm-vbr.patch
+++ b/kernel-atm-vbr.patch
@@ -40,7 +40,7 @@ diff -u -r1.2 atm.h
unsigned int icr; /* Initial Cell Rate (24-bit) */
unsigned int tbe; /* Transient Buffer Exposure (24-bit)
*/
@@ -243,4 +251,37 @@
- };
+
typedef unsigned short atm_backend_t;
+struct atm_trafprm_compat {
@@ -158,5 +158,5 @@ diff -u -r1.13 common.c
+ -EFAULT : 0;
+ }
case SO_ATMQOS:
- if (!test_bit(ATM_VF_HASQOS,&vcc->flags))
+ if (!test_bit(ATM_VF_HASQOS, &vcc->flags))
return -EINVAL;
diff --git a/kernel-atmdd.patch b/kernel-atmdd.patch
index 6dbd1b45..6298f6b1 100644
--- a/kernel-atmdd.patch
+++ b/kernel-atmdd.patch
@@ -13,7 +13,7 @@ diff -urN linux-2.4.25/drivers/atm/Kconfig
linux-2.4.25-atmdd/drivers/atm/Kconfi
--- linux-2.4.25/drivers/atm/Kcnfig 2003-08-25 13:44:41.000000000 +0200
+++ linux-2.4.25-atmdd/drivers/atm/Kconfig 2004-02-29 22:52:59.000000000
+0100
@@ -4,6 +4,14 @@
- default y
+ If you say N, all options in this submenu will be skipped and
disabled.
if ATM_DRIVERS && NETDEVICES && ATM
+
diff --git a/kernel-hostap.patch b/kernel-hostap.patch
index 32f6c245..3d31b8b5 100644
--- a/kernel-hostap.patch
+++ b/kernel-hostap.patch
@@ -12,7 +12,7 @@ diff -ur
linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_80211_t
printk(KERN_DEBUG "%s: hostap_data_start_xmit: short skb "
"(len=%d)\n", dev->name, skb->len);
@@ -234,6 +237,7 @@
- memcpy(skb_put(skb, ETH_ALEN), &hdr.addr4, ETH_ALEN);
+ skb_put_data(skb, &hdr.addr4, ETH_ALEN);
}
+xmit:
diff --git a/kernel-layer7.patch b/kernel-layer7.patch
index c06af650..b7390a08 100644
--- a/kernel-layer7.patch
+++ b/kernel-layer7.patch
@@ -2050,7 +2050,7 @@
--- linux-2.6.28-stock/net/netfilter/nf_conntrack_core.c 2009-01-07
16:05:35.000000000 -0600
+++ linux-2.6.28/net/netfilter/nf_conntrack_core.c 2009-01-07
16:07:31.000000000 -0600
@@ -201,6 +201,14 @@ destroy_conntrack(struct nf_conntrack *n
- * too. */
+ */
nf_ct_remove_expectations(ct);
+ #if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) ||
defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
@@ -2061,13 +2061,13 @@
+ #endif
+
+
- /* We overload first tuple to link into unconfirmed or dying list.*/
- BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
- hlist_nulls_del_rcu(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode);
+ nf_ct_del_from_dying_or_unconfirmed_list(ct);
+
+ local_bh_enable();
--- linux-2.6.28-stock/net/netfilter/nf_conntrack_standalone.c 2009-01-07
16:05:35.000000000 -0600
+++ linux-2.6.28/net/netfilter/nf_conntrack_standalone.c 2009-01-07
16:07:31.000000000 -0600
@@ -165,6 +165,12 @@ static int ct_seq_show(struct seq_file *
-
+ ct_show_zone(s, ct, NF_CT_DEFAULT_ZONE_DIR);
ct_show_delta_time(s, ct);
+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) ||
defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
diff --git a/kernel-pom-ng-IPV4OPTSSTRIP.patch
b/kernel-pom-ng-IPV4OPTSSTRIP.patch
index 8379226a..72ea2cf4 100644
--- a/kernel-pom-ng-IPV4OPTSSTRIP.patch
+++ b/kernel-pom-ng-IPV4OPTSSTRIP.patch
@@ -2,8 +2,8 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/Kconfig
linux-2.6.21.a/n
--- linux-2.6.21.b/net/ipv4/netfilter/Kconfig 2007-05-30 11:11:52.000000000
+0200
+++ linux-2.6.21.a/net/ipv4/netfilter/Kconfig 2007-05-30 11:18:08.000000000
+0200
@@ -668,5 +668,15 @@ config IP_NF_ARP_MANGLE
- Allows altering the ARP packet payload: source and destination
- hardware and network addresses.
+
+ endif # IP_NF_ARPTABLES
+config IP_NF_TARGET_IPV4OPTSSTRIP
+ tristate 'IPV4OPTSSTRIP target support'
diff --git a/kernel-rndis_host-wm5.patch b/kernel-rndis_host-wm5.patch
index 02d0d63c..a6806d66 100644
--- a/kernel-rndis_host-wm5.patch
+++ b/kernel-rndis_host-wm5.patch
@@ -1,12 +1,12 @@
--- linux-2.6.22-rc3-orig/drivers/net/usb/rndis_host.c 2007-05-25
22:55:14.000000000 -0400
+++ linux-2.6.22-rc3/drivers/net/usb/rndis_host.c 2007-05-27
17:06:16.000000000 -0400
@@ -499,8 +499,7 @@
- net->hard_header_len += sizeof (struct rndis_data_hdr);
- dev->hard_mtu = net->mtu + net->hard_header_len;
+ goto fail_and_release;
+ }
- dev->rx_urb_size = dev->hard_mtu + (dev->maxpacket + 1);
- dev->rx_urb_size &= ~(dev->maxpacket - 1);
+ dev->rx_urb_size = (dev->udev->speed == USB_SPEED_FULL) ? 16384 : 8192;
u.init->max_transfer_size = cpu_to_le32(dev->rx_urb_size);
- net->change_mtu = NULL;
+ net->netdev_ops = &rndis_netdev_ops;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/b00ece59d6a199f593546a77850bb8604787cec4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
