copusnet
Newbie
Registrován: 17.06.2004
Příspěvků: 40
|
Takze podme na to teraz z inej stranky. Stiahol som zvlast esfq,imq a imq-nat patche.
debian:/usr/src/linux# patch -p1 <../patch/esfq-2.6.diff
patching file include/linux/pkt_sched.h
patching file net/sched/Kconfig
patching file net/sched/Makefile
patching file net/sched/sch_esfq.c
debian:/usr/src/linux# patch -p1 <../patch/linux-2.6.2-imq-4.diff
patching file drivers/net/Kconfig
Hunk #1 succeeded at 81 (offset -4 lines).
patching file drivers/net/Makefile
Hunk #1 succeeded at 109 with fuzz 1 (offset -1 lines).
patching file drivers/net/imq.c
patching file include/linux/imq.h
patching file include/linux/netfilter_ipv4/ipt_IMQ.h
patching file include/linux/netfilter_ipv6/ip6t_IMQ.h
patching file include/linux/skbuff.h
Hunk #1 succeeded at 254 (offset 8 lines).
patching file net/ipv4/netfilter/Kconfig
patching file net/ipv4/netfilter/Makefile
Hunk #1 succeeded at 73 (offset 1 line).
patching file net/ipv4/netfilter/ipt_IMQ.c
patching file net/ipv6/netfilter/Makefile
Hunk #1 succeeded at 19 with fuzz 1.
patching file net/ipv6/netfilter/ip6t_IMQ.c
patching file net/sched/sch_generic.c
po tade to je v poriadku. Ale potom sko chcel dat imq-nat patch z oficialneho zdroja imq. Ale ako vidite tak tu to krachlo.
debian:/usr/src/linux/drivers/net# patch <imq-nat.diff
patching file imq.c
Hunk #1 FAILED at 37.
Hunk #2 FAILED at 54.
2 out of 2 hunks FAILED -- saving rejects to file imq.c.rej
Dalej prikladam aj samotny imq-nat.diff
--- imq.c.orig Sun Aug 11 15:30:24 2002
+++ imq.c Sun Aug 11 15:31:17 2002
@@ -37,7 +37,7 @@
imq_nf_hook,
PF_INET,
NF_IP_PRE_ROUTING,
- NF_IP_PRI_MANGLE + 1
+ NF_IP_PRI_NAT_DST + 1
};
static struct nf_hook_ops imq_egress_ipv4 = {
@@ -54,7 +54,7 @@
imq_nf_hook,
PF_INET6,
NF_IP6_PRE_ROUTING,
- NF_IP6_PRI_MANGLE + 1
+ NF_IP6_PRI_NAT_DST + 1
};
static struct nf_hook_ops imq_egress_ipv6 = {
Co moze byt zle. please help me
Obe IMQ patche su z oficialnych stranok imq.
|