Head of linuxppc-2.4 broekn by davem patch

Head of linuxppc-2.4 broekn by davem patch

[Stephen Williams]

Stefan Nickl Stefan.Nickl-at-kontron.com |PPC Linux Embedded| wrote:
> I already sent this patch to the list and to "davem" who
> commited the faulty version, but nobody seems to care...

Here is the exact same patch, packaged slightly differently
and re-sent, just in case it got lost in someone's inbox.
It is also possible that davem is thinking in terms of
changing the sk_buff definition t match this file. Either
way, something must be done.

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/06/11 09:00:55-07:00 steve@wing.XXXXXXXXXX
#   The sk_rcvbuf member does not exist in struct sk_buff
#   as declared in linux-2.4 skbuff.h.
#
# net/ipv4/tcp_input.c
#   2004/06/11 09:00:53-07:00 steve@wing.XXXXXXXXXX +2 -2
#   The sk_rcvbuf member does not exist in struct sk_buff
#   as declared in linux-2.4 skbuff.h.
#
diff -Nru a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
--- a/net/ipv4/tcp_input.c      2004-06-11 09:01:35 -07:00
+++ b/net/ipv4/tcp_input.c      2004-06-11 09:01:35 -07:00
@@ -476,8 +476,8 @@
                                   16 + sizeof(struct sk_buff));
                         space *= rcvmem;
                         space = min(space, sysctl_tcp_rmem[2]);
-                       if (space > sk->sk_rcvbuf)
-                               sk->sk_rcvbuf = space;
+                       if (space > sk->rcvbuf)
+                               sk->rcvbuf = space;
                 }
         }


--
Steve Williams                "The woods are lovely, dark and deep.
steve at XXXXXXXXXX           But I have promises to keep,
http://www.XXXXXXXXXX         and lines to code before I sleep,
http://www.picturel.com       And lines to code before I sleep."


** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/

Re: Head of linuxppc-2.4 broekn by davem patch

[Tom Rini]

On Fri, Jun 11, 2004 at 09:07:13AM -0700, Stephen Williams wrote:

> Stefan Nickl Stefan.Nickl-at-kontron.com |PPC Linux Embedded| wrote:
> >I already sent this patch to the list and to "davem" who
> >commited the faulty version, but nobody seems to care...
>
> Here is the exact same patch, packaged slightly differently
> and re-sent, just in case it got lost in someone's inbox.
> It is also possible that davem is thinking in terms of
> changing the sk_buff definition t match this file. Either
> way, something must be done.

I've gotten around to updating the linuxppc-2.4 repository to match the
current state of linux-2.4 again.  If there's still a problem, I would
suggest reproducing it with an i386 config (or CONFIG_ALL_PPC config)
and posting to lkml (linux-kernel@vger.kernel.org) and cc'ing Marcelo
and whomever made the broken change.  The problem in question didn't
come from us PPC folks, so fixing it in our tree is, IMHO, pointless
(the fix will either become obsolete and introduce minor pain when a fix
comes in upstream or the change will be reverted, again probably causing
us pain merging this in).

--
Tom Rini
http://gate.crashing.org/~trini/

** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/

Re: Head of linuxppc-2.4 broekn by davem patch

[Stephen Williams]

Tom Rini trini-at-kernel.crashing.org |PPC Linux Embedded| wrote:
> On Fri, Jun 11, 2004 at 09:07:13AM -0700, Stephen Williams wrote:
>
>
>>Stefan Nickl Stefan.Nickl-at-kontron.com |PPC Linux Embedded| wrote:
>>
>>>I already sent this patch to the list and to "davem" who
>>>commited the faulty version, but nobody seems to care...
>>
>>Here is the exact same patch, packaged slightly differently
>>and re-sent, just in case it got lost in someone's inbox.
>>It is also possible that davem is thinking in terms of
>>changing the sk_buff definition t match this file. Either
>>way, something must be done.
>
>
> I've gotten around to updating the linuxppc-2.4 repository to match the
> current state of linux-2.4 again.  If there's still a problem, I would
> suggest reproducing it with an i386 config (or CONFIG_ALL_PPC config)
> and posting to lkml (linux-kernel@vger.kernel.org) and cc'ing Marcelo
> and whomever made the broken change.


It appears that davem already supplied the fix in change set 1.1058.421.35.
That was May 30 or thereabouts. Thanks.

Now to see what nagging can get the ibm405gpr.h header file fixed...

--
Steve Williams                "The woods are lovely, dark and deep.
steve at icarus.com           But I have promises to keep,
http://www.icarus.com         and lines to code before I sleep,
http://www.picturel.com       And lines to code before I sleep."


** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/