[patch 3/3] git-net: sctp build fix (not for applying)

[patch 3/3] git-net: sctp build fix (not for applying)

[akpm]

From: Andrew Morton <akpm@linux-foundation.org>

net/sctp/sm_statetable.c:551: error: 'sctp_sf_tabort_8_4_8' undeclared here (not in a function)


Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 net/sctp/sm_statetable.c |    2 --
 1 file changed, 2 deletions(-)

diff -puN net/sctp/sm_statetable.c~git-net-sctp-hack net/sctp/sm_statetable.c
--- a/net/sctp/sm_statetable.c~git-net-sctp-hack
+++ a/net/sctp/sm_statetable.c
@@ -527,8 +527,6 @@ static const sctp_sm_table_entry_t prsct
 	/* SCTP_STATE_EMPTY */ \
 	TYPE_SCTP_FUNC(sctp_sf_ootb), \
 	/* SCTP_STATE_CLOSED */ \
-	TYPE_SCTP_FUNC(sctp_sf_tabort_8_4_8), \
-	/* SCTP_STATE_COOKIE_WAIT */ \
 	TYPE_SCTP_FUNC(sctp_sf_discard_chunk), \
 	/* SCTP_STATE_COOKIE_ECHOED */ \
 	TYPE_SCTP_FUNC(sctp_sf_eat_auth), \
_

Re: [patch 3/3] git-net: sctp build fix (not for applying)

[Vlad Yasevich]

akpm@linux-foundation.org wrote:
> From: Andrew Morton <akpm@linux-foundation.org>
> 
> net/sctp/sm_statetable.c:551: error: 'sctp_sf_tabort_8_4_8' undeclared here (not in a function)
> 

Andrew, is the a result of the merge of net-2.6.24 with net-2.6?  

That's the only way I see this happening.

> 
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  net/sctp/sm_statetable.c |    2 --
>  1 file changed, 2 deletions(-)
> 
> diff -puN net/sctp/sm_statetable.c~git-net-sctp-hack net/sctp/sm_statetable.c
> --- a/net/sctp/sm_statetable.c~git-net-sctp-hack
> +++ a/net/sctp/sm_statetable.c
> @@ -527,8 +527,6 @@ static const sctp_sm_table_entry_t prsct
>  	/* SCTP_STATE_EMPTY */ \
>  	TYPE_SCTP_FUNC(sctp_sf_ootb), \
>  	/* SCTP_STATE_CLOSED */ \
> -	TYPE_SCTP_FUNC(sctp_sf_tabort_8_4_8), \
                       ^^^^^^^^^^^^^^^^^^^^
That should be changed to sctp_sf_ootb and then it'll compile.  As is, the patch
is wrong.

Thanks
-vlad

> -	/* SCTP_STATE_COOKIE_WAIT */ \
>  	TYPE_SCTP_FUNC(sctp_sf_discard_chunk), \
>  	/* SCTP_STATE_COOKIE_ECHOED */ \
>  	TYPE_SCTP_FUNC(sctp_sf_eat_auth), \
> _
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [patch 3/3] git-net: sctp build fix (not for applying)

[David Miller]

From: Vlad Yasevich <vladislav.yasevich@hp.com>
Date: Wed, 03 Oct 2007 09:50:55 -0400

> akpm@linux-foundation.org wrote:
> > From: Andrew Morton <akpm@linux-foundation.org>
> > 
> > net/sctp/sm_statetable.c:551: error: 'sctp_sf_tabort_8_4_8' undeclared here (not in a function)
> > 
> 
> Andrew, is the a result of the merge of net-2.6.24 with net-2.6?  

Actually, it is a result of merging with Linus's tree since your SCTP
bits were there already, that's why Andrew hit this.

> That's the only way I see this happening.

Right.

I'll resolve this cleanly as I rebase net-2.6.24 today.

Re: [patch 3/3] git-net: sctp build fix (not for applying)

[Vlad Yasevich]

David Miller wrote:
> From: Vlad Yasevich <vladislav.yasevich@hp.com>
> Date: Wed, 03 Oct 2007 09:50:55 -0400
> 
>> akpm@linux-foundation.org wrote:
>>> From: Andrew Morton <akpm@linux-foundation.org>
>>>
>>> net/sctp/sm_statetable.c:551: error: 'sctp_sf_tabort_8_4_8' undeclared here (not in a function)
>>>
>> Andrew, is the a result of the merge of net-2.6.24 with net-2.6?  
> 
> Actually, it is a result of merging with Linus's tree since your SCTP
> bits were there already, that's why Andrew hit this.
> 
>> That's the only way I see this happening.
> 
> Right.
> 
> I'll resolve this cleanly as I rebase net-2.6.24 today.

OK.  Thanks David.

-vlad