retronetworking
/
isdn4linux
13
0
Fork 0
Code Pull Requests Releases Activity

patch works again with 2.4.x kernel's

This commit is contained in:
Detlef Wengorz 2001-01-20 12:16:39 +00:00
parent 4662632e5b
commit 2f5d09601d
2 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
patch_isdnbits_linux-2.4.0-test9
View File

@ -1,36 +0,0 @@
diff -urN --minimal linux-2.4.0-test9/include/linux/skbuff.h linux/include/linux/skbuff.h
--- linux-2.4.0-test9/include/linux/skbuff.h Sat Sep 9 08:34:22 2000
+++ linux/include/linux/skbuff.h Wed Oct 18 15:52:43 2000
@@ -146,6 +146,9 @@
#ifdef CONFIG_NET_SCHED
__u32 tc_index; /* traffic control index */
#endif
+#if defined(CONFIG_ISDN) || defined(CONFIG_ISDN_MODULE)
+ unsigned short isdn_skb_bits; /* isdn netfilter support */
+#endif
};
#define SK_WMEM_MAX 65535
diff -urN --minimal linux-2.4.0-test9/net/core/skbuff.c linux/net/core/skbuff.c
--- linux-2.4.0-test9/net/core/skbuff.c Mon May 22 16:50:55 2000
+++ linux/net/core/skbuff.c Wed Oct 18 15:51:51 2000
@@ -246,6 +246,9 @@
#endif
memset(skb->cb, 0, sizeof(skb->cb));
skb->priority = 0;
+#if defined(CONFIG_ISDN) || defined(CONFIG_ISDN_MODULE)
+ skb->isdn_skb_bits = 0;
+#endif
}
/*
@@ -375,6 +378,9 @@
#endif
#ifdef CONFIG_NET_SCHED
new->tc_index = old->tc_index;
+#endif
+#if defined(CONFIG_ISDN) || defined(CONFIG_ISDN_MODULE)
+ new->isdn_skb_bits = old->isdn_skb_bits;
#endif
}

41
patch_isdnbits_linux-2.4.1-pre8 Normal file
View File

@ -0,0 +1,41 @@
diff -urN --minimal linux-2.4.0-isdn/include/linux/skbuff.h linux/include/linux/skbuff.h
--- linux-2.4.0-isdn/include/linux/skbuff.h Fri Jan 19 15:07:53 2001
+++ linux/include/linux/skbuff.h Fri Jan 19 15:16:52 2001
@@ -135,6 +135,10 @@
#endif
#endif /*CONFIG_NETFILTER*/
+#if CONFIG_ISDN || CONFIG_ISDN_MODULE
+ unsigned long isdn_skb_bits; /* isdn netfilter support */
+#endif
+
#if defined(CONFIG_HIPPI)
union{
__u32 ifield;
diff -urN --minimal linux-2.4.0-isdn/net/core/skbuff.c linux/net/core/skbuff.c
--- linux-2.4.0-isdn/net/core/skbuff.c Fri Jan 19 15:06:44 2001
+++ linux/net/core/skbuff.c Fri Jan 19 15:19:37 2001
@@ -244,6 +244,11 @@
skb->nf_debug = 0;
#endif
#endif
+
+#if CONFIG_ISDN || CONFIG_ISDN_MODULE
+ skb->isdn_skb_bits = 0;
+#endif
+
#ifdef CONFIG_NET_SCHED
skb->tc_index = 0;
#endif
@@ -366,6 +371,11 @@
new->nf_debug=old->nf_debug;
#endif
#endif
+
+#if CONFIG_ISDN || CONFIG_ISDN_MODULE
+ new->isdn_skb_bits = old->isdn_skb_bits;
+#endif
+
#ifdef CONFIG_NET_SCHED
new->tc_index = old->tc_index;
#endif