Re: [Discussion] New installation (UNCLASSIFIED)

[John Heffner <jheffner@xxxxxxx>]

The difference between 2.6.18 and 2.6.18.2 actually causes a conflict, 
though it turns out to be an easy one to resolve.  They changed the 
bh_lock_sock(sk) call to bh_lock_sock_nested(sk).  If you cut and paste 
'UPDATE_FUNC(tcp_sk(sk), web100_update_segrecv(tcp_sk(sk),
> skb));' into the appropriate spot in tcp_ipv6.c, the build should be 
okay.

This is the first time one of the bugfix versions (4th digit) has 
conflicted with the web100 patch.  We don't usually release patches 
4th-digit versions, but since there's a conflict now, I can roll a 
special release if there's demand.

  -John


Kidwell, Michael Mr NISO/APPTIS wrote:
> Classification:  UNCLASSIFIED 
> Caveats: NONE
>
> The new kernel seems to be functioning ok, but the patch fails. Anyone have
> any tips on troubleshooting this. Thanks. -- Mike
>
> Linux speedy 2.6.18.2 #1 SMP Thu Nov 16 09:39:54 EST 2006 i686 i686
>  i386 GNU/Linux
>
> ----------------------------------------------------------------------------
> -----
>
> patch -p1 < /usr/local/src/web100/web100-2.6.18-2.5.12-200609221010.patch
>
>
> Hunk #3 FAILED at 1241.
> 1 out of 6 hunks FAILED -- saving rejects to file net/ipv6/tcp_ipv6.c.rej
>
> ----------------------------------------------------------------------------
> ------
>
> more tcp_ipv6.c.rej
> ***************
> *** 1229,1234 ****
>         skb->dev = NULL;
>
>         bh_lock_sock(sk);
>         ret = 0;
>         if (!sock_owned_by_user(sk)) {
>   #ifdef CONFIG_NET_DMA
> --- 1241,1247 ----
>         skb->dev = NULL;
>
>         bh_lock_sock(sk);
> +       WEB100_UPDATE_FUNC(tcp_sk(sk), web100_update_segrecv(tcp_sk(sk),
> skb));
>         ret = 0;
>         if (!sock_owned_by_user(sk)) {
>   #ifdef CONFIG_NET_DMA
> Classification:  UNCLASSIFIED 
> Caveats: NONE
>
>
> _______________________________________________
> Discussion mailing list
> Discussion@xxxxxxxxxx
> http://internal.web100.org/mailman/listinfo/discussion


_______________________________________________
Discussion mailing list
Discussion@xxxxxxxxxx
http://internal.web100.org/mailman/listinfo/discussion