<div dir="ltr"><div class="gmail_default" style="font-family:'courier new',monospace;font-size:small">Not familiar with Git patch, but I guess it is just "patch".</div><div class="gmail_default" style="font-family:'courier new',monospace;font-size:small">
follow this</div><div class="gmail_default" style="font-family:'courier new',monospace;font-size:small"><br></div><div class="gmail_default" style="font-family:'courier new',monospace;font-size:small"><a href="https://groups.google.com/forum/#!topic/msysgit/6NNvXeyd5xM">https://groups.google.com/forum/#!topic/msysgit/6NNvXeyd5xM</a><br>
</div><div class="gmail_default" style="font-family:'courier new',monospace;font-size:small"><br></div><div class="gmail_default" style="font-family:'courier new',monospace;font-size:small">-tl</div></div>
<div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Jan 10, 2014 at 8:42 PM, Aruna Hewapathirane <span dir="ltr"><<a href="mailto:aruna.hewapathirane-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org" target="_blank">aruna.hewapathirane@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Ted believe me I have tried and tried and finally decided to ask for help. The patch errors are below:<br>
<div><br>aruna@aruna-desktop:/media/kernel-dev/next-net/net-next$ git format-patch --subject-prefix="PATCH v1" HEAD^<br>
0001-Network-Subsystem-v2.patch<br><br>aruna@aruna-desktop:/media/kernel-dev/next-net/net-next$ git apply --check 0001-Network-Subsystem-v2.patch<br><br>error: patch failed: net/core/neighbour.c:117<br><br>error: net/core/neighbour.c: patch does not apply<br>
<br></div><div class="gmail_extra">It makes no sense to me because all the other files compile clean nil errors :( <br></div><div class="gmail_extra"><div><div class="h5"><br><div class="gmail_quote">On Fri, Jan 10, 2014 at 8:36 PM, ted leslie <span dir="ltr"><<a href="mailto:ted.leslie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org" target="_blank">ted.leslie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div style="font-family:courier new,monospace;font-size:small">What patch error are you getting?</div><div style="font-family:courier new,monospace;font-size:small">
<br></div><div style="font-family:courier new,monospace;font-size:small">You can see what the patch is doing, you can just go put the changed two lines in with editor.</div><span><font color="#888888"><div style="font-family:courier new,monospace;font-size:small">
-tl</div><div style="font-family:courier new,monospace;font-size:small"><br></div><div style="font-family:courier new,monospace;font-size:small"><br></div></font></span></div><div><div><div class="gmail_extra">
<br><br><div class="gmail_quote">On Fri, Jan 10, 2014 at 8:05 PM, Aruna Hewapathirane <span dir="ltr"><<a href="mailto:aruna.hewapathirane@gmail.com" target="_blank">aruna.hewapathirane-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div><div>Hello Everybody,<br></div><div><br></div>I am a total newbie to kernel hacking and I have a
question. Am trying to patch the Network Subsystem and changing the
net_random() to direct calls of prandom_u32. Why ? Because it is<br>
harder to audit / <span>grep</span> and new commits actually use prandom_u32 only am told.<br><br></div><div>u32 prandom_u32(void); /* defined in include/linux/random.h: */<br><br></div><div>#define net_random() prandom_u32() /* defined in include/linux/net.h */<br>
<br></div><div>Everything works as expected until I get to net/core/neighbour.c and then patch fails to apply.<br></div><div><br></div>The diff is here: <br><div><br>-------------------------------------------------------------------------------------------------------------------------------<br>
diff --git a/net/core/neighbour.c b/net/core/neighbour.c<br>index 47d834e..ea97361 100644<br>--- a/net/core/neighbour.c<br>+++ b/net/core/neighbour.c<br>@@ -117,7 +117,7 @@ static void neigh_cleanup_and_release(struct neighbour *neig<br>
<br> unsigned long neigh_rand_reach_time(unsigned long base)<br> {<br>- return base ? (prandom_u32() % base) + (base >> 1) : 0;<br>+ return base ? (net_random() % base) + (base >> 1) : 0;<br> }<br>
EXPORT_SYMBOL(neigh_rand_reach_time);<br> <br>@@ -1415,7 +1415,7 @@ void pneigh_enqueue(struct neigh_table *tbl, struct neigh_<br> struct sk_buff *skb)<br> {<br> unsigned long now = jiffies;<br>
- unsigned long sched_next = now + (prandom_u32() %<br>+ unsigned long sched_next = now + (net_random() %<br> NEIGH_VAR(p, PROXY_DELAY));<br> <br> if (tbl->proxy_queue.qlen > NEIGH_VAR(p, PROXY_QLEN)) {<br>
-------------------------------------------------------------------------------------------------------------------------------<br>
<br></div><div>I can use some help and guidance please, what am I doing
wrong ? Or not seeing ? It's just this neighbor.c file that is doing
this and I am stumped. <br><br></div>Thank you.<div><div><img src="https://mail.google.com/mail/u/0/images/cleardot.gif"></div></div><span><font color="#888888">Aruna<br clear="all"><div><a href="https://sites.google.com/site/arunahewapathirane/home/business-card/buisness-card.png?attredirects=0" target="_blank"><br>
</a>
</div></font></span></div>
</blockquote></div><br></div>
</div></div></blockquote></div><br><br clear="all"><br></div></div><span class="HOEnZb"><font color="#888888">-- <br><span style="font-family:comic sans ms,sans-serif"><b>Aruna Hewapathirane</b><br>Consultant/Trainer<br>
Phone : <a href="tel:647-709-9269" value="+16477099269" target="_blank">647-709-9269</a><br>Website:<a href="http://goog_1768911931" target="_blank"> </a><a href="http://sahanaya.net/aruna/" target="_blank">Open Source Solutions</a></span><br>
<br><br><a href="https://sites.google.com/site/arunahewapathirane/home/business-card/buisness-card.png?attredirects=0" target="_blank"><br></a>
</font></span></div></div>
</blockquote></div><br></div>