2.3.18ac4 patch about pcmcia module and netfilter

Byeong-ryeol Kim (jinbo21@soback.kornet.nm.kr)
Wed, 15 Sep 1999 23:11:44 +0900 (KST)

Hello,
I send you 2 patches about pcmcia-module, netfilter fo 2.3.18ac4.
The one is for compiling kernel configred with PCMCIA as module,
the other is for compiling kernel configured with NETFILTER
undefined.

Since I don't use laptop, I cannout test this fully.
But, It was compiled with 8390 module.
Maybe, NETFILTER patch is bogus, but, As far as it is an
option when configuring kernel, it should be compiled without
it.

Thanks,

--- linux-2.3.18-ac4/Makefile~ Wed Sep 15 13:39:53 1999
+++ linux-2.3.18-ac4/Makefile Wed Sep 15 19:00:36 1999
@@ -146,8 +146,12 @@
DRIVERS := $(DRIVERS) drivers/pci/pci.a
endif

-ifdef CONFIG_PCMCIA
+ifeq ($(CONFIG_PCMCIA),y)
DRIVERS := $(DRIVERS) drivers/pcmcia/pcmcia.o
+else
+ ifeq ($CONFIG_PCMCIA),m)
+ DRIVERS := $(DRIVERS) drivers/pcmcia/pcmcia_core.o
+ endif
endif

ifdef CONFIG_PCMCIA_NETCARD

--- linux-2.3.18-ac4/net/ipv4/route.c~ Wed Sep 1 03:23:03 1999
+++ linux-2.3.18-ac4/net/ipv4/route.c Wed Sep 15 20:09:19 1999
@@ -1106,9 +1106,11 @@
rth->rt_dst = daddr;
rth->key.tos = tos;
#ifdef CONFIG_IP_ROUTE_FWMARK
+#ifdef CONFIG_NETFILTER
if (skb->nfreason == NF_REASON_FOR_ROUTING)
rth->key.fwmark = skb->nfmark;
else
+#endif
rth->key.fwmark = 0;
#endif
rth->key.src = saddr;
@@ -1188,9 +1190,11 @@
key.src = saddr;
key.tos = tos;
#ifdef CONFIG_IP_ROUTE_FWMARK
+#ifdef CONFIG_NETFILTER
if (skb->nfreason == NF_REASON_FOR_ROUTING)
key.fwmark = skb->nfmark;
else
+#endif
key.fwmark = 0;
#endif
key.iif = dev->ifindex;
@@ -1313,9 +1317,11 @@
rth->rt_dst = daddr;
rth->key.tos = tos;
#ifdef CONFIG_IP_ROUTE_FWMARK
+#ifdef CONFIG_NETFILTER
if (skb->nfreason == NF_REASON_FOR_ROUTING)
rth->key.fwmark = skb->nfmark;
else
+#endif
rth->key.fwmark = 0;
#endif
rth->key.src = saddr;
@@ -1390,9 +1396,11 @@
rth->rt_dst = daddr;
rth->key.tos = tos;
#ifdef CONFIG_IP_ROUTE_FWMARK
+#ifdef CONFIG_NETFILTER
if (skb->nfreason == NF_REASON_FOR_ROUTING)
rth->key.fwmark = skb->nfmark;
else
+#endif
rth->key.fwmark = 0;
#endif
rth->key.src = saddr;
@@ -1480,9 +1488,13 @@
rth->key.iif == iif &&
rth->key.oif == 0 &&
#ifdef CONFIG_IP_ROUTE_FWMARK
+#ifdef CONFIG_NETFILTER
rth->key.fwmark
== (skb->nfreason == NF_REASON_FOR_ROUTING
? skb->nfmark : 0) &&
+#else
+ rth->key.fwmark == 0 &&
+#endif
#endif
rth->key.tos == tos) {
rth->u.dst.lastuse = jiffies;

-- 
 "Where there is a will, there is a way."  jinbo21@soback.kornet.nm.kr 
  For the future of you and me!            hitel: jinbo21




-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/