2007/9/20, ツ Leandro Sales <leandroal@xxxxxxxxx>: > 2007/9/20, Tommi Saviranta <wnd@xxxxxx>: > > On Thu, Sep 20, 2007 at 14:54:54 -0300, ツ Leandro Sales wrote: > > > + * This code has been developed by the Federal University of Campina Grande > > > + * Embedded Systems and Pervasive Computing Lab and University of Helsinki > > > + * For further information please see > > > + * http://embedded.ufcg.edu.br/ <leandro@xxxxxxxxxxxxxxxxxxxx> > > > + * http://www.iki.fi/ <wnd@xxxxxx> > > > > Looks like I failed to provide Leandro proper information about > > cs.helsinki.fi in time. :-) Anyway, I will have to figure out a proper > > URI for "see also" later, but http://www.iki.fi/ has most definitely > > nothing to do with CCID 4. > > > > > > Signed-off-by: Tommi Saviranta <wnd@xxxxxx> > > --- > > diff --git a/net/dccp/ccids/ccid4.c b/net/dccp/ccids/ccid4.c > > index a1c9055..4b8555a 100644 > > --- a/net/dccp/ccids/ccid4.c > > +++ b/net/dccp/ccids/ccid4.c > > @@ -1,15 +1,27 @@ > > /* > > * net/dccp/ccids/ccid4.c > > * > > + * Copyright (c) 2007 Federal University of Campina Grande, Paraiba, BR. > > * Copyright (c) 2007 University of Helsinki, Finland. > > * Copyright (c) 2007 The University of Aberdeen, Scotland, UK > > * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. > > - * Copyright (c) 2005-7 Ian McDonald <ian.mcdonald@xxxxxxxxxxx> > > * > > * An implementation of the DCCP protocol > > * > > + * Copyrithg (c) 2007 Leandro Sales, Tommi Saviranta > > + * > > + * This code has been developed by the Federal University of Campina Grande > > + * Embedded Systems and Pervasive Computing Lab and the Department of Computer > > + * Science at the University of Helsinki. > > + * For further information please see > > + * http://embedded.ufcg.edu.br/ <leandro@xxxxxxxxxxxxxxxxxxxx> > > + * http://www.cs.helsinki.fi/ <wnd@xxxxxx> > > + * > > + * Copyrithg (c) 2005-7 Ian McDonald > > + * > > * This code is based on code developed by the University of Waikato WAND > > * research group. For further information please see http://www.wand.net.nz/ > > + * or e-mail Ian McDonald - ian.mcdonald@xxxxxxxxxxx > > * > > * This code also uses code from Lulea University, rereleased as GPL by its > > * authors: > > diff --git a/net/dccp/ccids/ccid4.h b/net/dccp/ccids/ccid4.h > > index f9ca05b..1b507a6 100644 > > --- a/net/dccp/ccids/ccid4.h > > +++ b/net/dccp/ccids/ccid4.h > > @@ -3,12 +3,24 @@ > > /* > > * net/dccp/ccids/ccid4.h > > * > > + * Copyright (c) 2007 Federal University of Campina Grande, Paraiba, BR. > > * Copyright (c) 2007 University of Helsinki, Finland. > > * Copyright (c) 2007 The University of Aberdeen, Scotland, UK > > * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. > > * > > * An implementation of the DCCP protocol > > * > > + * Copyrithg (c) 2007 Leandro Sales, Tommi Saviranta > > + * > > + * This code has been developed by the Federal University of Campina Grande > > + * Embedded Systems and Pervasive Computing Lab and the Department of Computer > > + * Science at the University of Helsinki. > > + * For further information please see > > + * http://embedded.ufcg.edu.br/ <leandro@xxxxxxxxxxxxxxxxxxxx> > > + * http://www.cs.helsinki.fi/ <wnd@xxxxxx> > > + * > > + * Copyrithg (c) 2005-7 Ian McDonald > > + * > > * This code is based on code developed by the University of Waikato WAND > > * research group. For further information please see http://www.wand.net.nz/ > > * or e-mail Ian McDonald - ian.mcdonald@xxxxxxxxxxx > > > > Signed-off-by: Leandro Sales <leandro@xxxxxxxxxxxxxxxxxxxx> > Signed-off-by: Leandro Sales <leandro@xxxxxxxxxxxxxxxxxxxx> After talk to Ian, I decided to regenerate this patch including the Tommi patch applied against the mine. As a result, this will avoid patches against patches. Because of this new patch, when patch #4 is applied, it will produce a warning like the following: # sudo patch -p1 < nompacket.patch patching file net/dccp/ccids/ccid4.c Hunk #1 succeeded at 494 (offset 1 line). Hunk #2 succeeded at 805 (offset 1 line). patching file net/dccp/ccids/ccid4.h In this case, I will also resubmit the patch #4 fixing this to avoid this warning. diff -uprN dccp-ccid4.base/net/dccp/ccids/ccid4.c dccp-ccid4/net/dccp/ccids/ccid4.c --- dccp-ccid4.base/net/dccp/ccids/ccid4.c 2007-09-21 00:05:18.000000000 -0300 +++ dccp-ccid4/net/dccp/ccids/ccid4.c 2007-09-21 00:02:56.000000000 -0300 @@ -1,15 +1,26 @@ /* * net/dccp/ccids/ccid4.c * + * Copyright (c) 2007 Federal University of Campina Grande, Paraiba, BR. * Copyright (c) 2007 University of Helsinki, Finland. * Copyright (c) 2007 The University of Aberdeen, Scotland, UK * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. - * Copyright (c) 2005-7 Ian McDonald <ian.mcdonald@xxxxxxxxxxx> * * An implementation of the DCCP protocol * + * Copyrithg (c) 2007 Leandro Sales, Tommi Saviranta + * + * This code has been developed by the Federal University of Campina Grande + * Embedded Systems and Pervasive Computing Lab and the Department of Computer + * Science at the University of Helsinki. For further information please see + * http://embedded.ufcg.edu.br/ <leandro@xxxxxxxxxxxxxxxxxxxx> + * http://www.iki.fi/ <wnd@xxxxxx> + * + * Copyrithg (c) 2005-7 Ian McDonald + * * This code is based on code developed by the University of Waikato WAND * research group. For further information please see http://www.wand.net.nz/ + * or e-mail Ian McDonald - ian.mcdonald@xxxxxxxxxxx * * This code also uses code from Lulea University, rereleased as GPL by its * authors: @@ -35,6 +46,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + #include "../dccp.h" #include "ccid4.h" @@ -1000,7 +1012,8 @@ static __exit void ccid4_module_exit(voi } module_exit(ccid4_module_exit); -MODULE_AUTHOR("Tommi Saviranta <wnd@xxxxxx>, " +MODULE_AUTHOR("Leandro Melo de Sales <leandro@xxxxxxxxxxxxxxxxxxxx, " + "Tommi Saviranta <wnd@xxxxxx>, " "Ian McDonald <ian.mcdonald@xxxxxxxxxxx>, " "Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxxxx>"); MODULE_DESCRIPTION("DCCP TFRC CCID4 CCID"); diff -uprN dccp-ccid4.base/net/dccp/ccids/ccid4.h dccp-ccid4/net/dccp/ccids/ccid4.h --- dccp-ccid4.base/net/dccp/ccids/ccid4.h 2007-09-21 00:05:18.000000000 -0300 +++ dccp-ccid4/net/dccp/ccids/ccid4.h 2007-09-21 00:02:56.000000000 -0300 @@ -3,12 +3,23 @@ /* * net/dccp/ccids/ccid4.h * + * Copyright (c) 2007 Federal University of Campina Grande, Paraiba, BR. * Copyright (c) 2007 University of Helsinki, Finland. * Copyright (c) 2007 The University of Aberdeen, Scotland, UK * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. * * An implementation of the DCCP protocol * + * Copyrithg (c) 2007 Leandro Sales, Tommi Saviranta + * + * This code has been developed by the Federal University of Campina Grande + * Embedded Systems and Pervasive Computing Lab and the Department of Computer + * Science at the University of Helsinki. For further information please see + * http://embedded.ufcg.edu.br/ <leandro@xxxxxxxxxxxxxxxxxxxx> + * http://www.iki.fi/ <wnd@xxxxxx> + * + * Copyrithg (c) 2005-7 Ian McDonald + * * This code is based on code developed by the University of Waikato WAND * research group. For further information please see http://www.wand.net.nz/ * or e-mail Ian McDonald - ian.mcdonald@xxxxxxxxxxx - To unsubscribe from this list: send the line "unsubscribe dccp" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
