请教一个关于PATCH的错误问题

[coreyhsu2020]

最近做AIRCRACK-NG的相关东西，涉及到一个打补丁的问题，但是总提示错误：

具体如下：
root@xujiajay:/home/xujiajay/compat-wireless-3.6.8-1/net/wireless# wget http://patches.aircrack-ng.org/channel-negative-one-maxim.patch
--2013-10-13 22:15:23-- http://patches.aircrack-ng.org/channel-negative-one-maxim.patch
正在解析主机 patches.aircrack-ng.org (patches.aircrack-ng.org)... 213.186.33.2, 2001:41d0:1:1b00:213:186:33:2
正在连接 patches.aircrack-ng.org (patches.aircrack-ng.org)|213.186.33.2|:80... 已连接。
已发出 HTTP 请求，正在等待回应... 200 OK
长度： 1021 [text/plain]
正在保存至: “channel-negative-one-maxim.patch”

100%[======================================>] 1,021 --.-K/s 用时 0s

2013-10-13 22:15:24 (116 MB/s) - 已保存 “channel-negative-one-maxim.patch” [1021/1021])

root@xujiajay:/home/xujiajay/compat-wireless-3.6.8-1/net/wireless# patch -p1 < channel-negative-one-maxim.patch
can't find file to patch at input line 15
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|commit fffd6e63ea75850dafbf2ccfb38a4189f43c0282
|Author: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
|Date: Tue Jun 1 15:43:21 2010 +0300
|
| wireless: allow to retrieve the channel set on monitor interface
|
| This will allow to preserve compatibility with userspace
|
| Signed-off-by: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
|
|diff --git a/net/wireless/chan.c b/net/wireless/chan.c
|index b01a6f6..09d979b 100644
|--- a/net/wireless/chan.c
|+++ b/net/wireless/chan.c
--------------------------
File to patch:
Skip this patch? [y] y
Skipping patch.
2 out of 2 hunks ignored

不知道怎么搞，没搞过打补丁的事情，感觉很麻烦的说啊，谢谢大牛指点

[糊涂的小白]

在目录/home/xujiajay/compat-wireless-3.6.8-1/net/wireless下是用-p3参数 在/home/xujiajay/compat-wireless-3.6.8-1/目录下，才使用-p1参数 patch中的diff --git a/net/wireless/chan.c b/net/wireless/chan.c这一行指明了要修改的文件的相对路径。 -p N用来跳过“a/net/wireless/chan.c”中的N级目录。-p1 跳过1级（a/），-p2跳过两级(a/net)，-p3路过三级(a/net/wireless)。

[coreyhsu2020]

感谢了，我马上试一试看看

[coreyhsu2020]

我用 root@xujiajay:/home/xujiajay/compat-wireless-3.6.8-1/net/wireless# patch -Np3 -i channel-negative-one-maxim.patch 现在又提示： patching file chan.c Hunk #1 FAILED at 49 Hunk #2 FAILED at 76 2 out of 2 hunks FAILED --saving reject s to file chan.c.rej 这个错误 继续请教了？

[糊涂的小白]

文件chan.c打patch之前被修改过，或者与patch版本不匹配。导致产生冲突。 冲突不多的话，可以编辑文件，解决冲突。