[PATCH 3/25] Adjustments of the ccid-4 copyright and kernel module authors

[PATCH 3/25] Adjustments of the ccid-4 copyright and kernel module authors

[Leandro]

[CCID-4] Adjustments of the ccid-4 copyright and kernel module authors

Signed-off-by: Leandro Melo de Sales <leandro@embedded.ufcg.edu.br>
Signed-off-by: Tommi Saviranta <wnd@iki.fi>

Index: leandro.new/net/dccp/ccids/ccid4.c
=================================--- leandro.new.orig/net/dccp/ccids/ccid4.c
+++ leandro.new/net/dccp/ccids/ccid4.c
@@ -1,14 +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@jandi.co.nz>
  *
  *  An implementation of the DCCP protocol
  *
- *  This code has been developed by the University of Waikato WAND
+ *  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/ <leandroal@gmail.com>
+ *  http://www.iki.fi/ <wnd@iki.fi>
+ *
+ *  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@jandi.co.nz
  *
  *  This code also uses code from Lulea University, rereleased as GPL by its
  *  authors:
@@ -960,8 +972,8 @@ static __exit void ccid4_module_exit(voi
 }
 module_exit(ccid4_module_exit);
 
-MODULE_AUTHOR("Ian McDonald <ian.mcdonald@jandi.co.nz>, "
-	      "Arnaldo Carvalho de Melo <acme@ghostprotocols.net>");
+MODULE_AUTHOR("Leandro Melo de Sales <leandroal@gmail.com>, "
+	      "Tommi Saviranta <wnd@iki.fi>");
 MODULE_DESCRIPTION("DCCP TFRC CCID4 CCID");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("net-dccp-ccid-4");
Index: leandro.new/net/dccp/ccids/ccid4.h
=================================--- leandro.new.orig/net/dccp/ccids/ccid4.h
+++ leandro.new/net/dccp/ccids/ccid4.h
@@ -1,14 +1,26 @@
 #ifndef _DCCP_CCID4_H_
 #define _DCCP_CCID4_H_
 /*
- *  net/dccp/ccids/ccid4.h
+ *  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.
  *
  *  An implementation of the DCCP protocol
  *
- *  This code has been developed by the University of Waikato WAND
+ *  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/ <leandroal@gmail.com>
+ *  http://www.iki.fi/ <wnd@iki.fi>
+ *
+ *  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@jandi.co.nz
  *

Re: [PATCH 3/25] Adjustments of the ccid-4 copyright and kernel

[Tommi Saviranta]

On Wed, Oct 31, 2007 at 20:21:53 -0300, Leandro wrote:
> [CCID-4] Adjustments of the ccid-4 copyright and kernel module authors
> 
> Signed-off-by: Leandro Melo de Sales <leandro@embedded.ufcg.edu.br>
> Signed-off-by: Tommi Saviranta <wnd@iki.fi>
> 
> Index: leandro.new/net/dccp/ccids/ccid4.h
> =================================> --- leandro.new.orig/net/dccp/ccids/ccid4.h
> +++ leandro.new/net/dccp/ccids/ccid4.h
> @@ -1,14 +1,26 @@
>  #ifndef _DCCP_CCID4_H_
>  #define _DCCP_CCID4_H_
>  /*
> - *  net/dccp/ccids/ccid4.h
> + *  net/dccp/ccids/ccid4.c

Is this intentional? ccid2.h and ccid3.h both have ccidX.h.

Re: [PATCH 3/25] Adjustments of the ccid-4 copyright and kernel

[Arnaldo Carvalho de Melo]

Em Thu, Nov 01, 2007 at 02:22:49PM +0200, Tommi Saviranta escreveu:
> On Wed, Oct 31, 2007 at 20:21:53 -0300, Leandro wrote:
> > [CCID-4] Adjustments of the ccid-4 copyright and kernel module authors
> > 
> > Signed-off-by: Leandro Melo de Sales <leandro@embedded.ufcg.edu.br>
> > Signed-off-by: Tommi Saviranta <wnd@iki.fi>
> > 
> > Index: leandro.new/net/dccp/ccids/ccid4.h
> > =================================> > --- leandro.new.orig/net/dccp/ccids/ccid4.h
> > +++ leandro.new/net/dccp/ccids/ccid4.h
> > @@ -1,14 +1,26 @@
> >  #ifndef _DCCP_CCID4_H_
> >  #define _DCCP_CCID4_H_
> >  /*
> > - *  net/dccp/ccids/ccid4.h
> > + *  net/dccp/ccids/ccid4.c
> 
> Is this intentional? ccid2.h and ccid3.h both have ccidX.h.

I suggest just removing the file name altogether. Dave Jones has been
doing this and I agree with him that the names in these files are not
useful.

- Arnaldo

Re: [PATCH 3/25] Adjustments of the ccid-4 copyright and kernel

[Tommi Saviranta]

On Thu, Nov 01, 2007 at 10:24:44 -0200, Arnaldo Carvalho de Melo wrote:
> Em Thu, Nov 01, 2007 at 02:22:49PM +0200, Tommi Saviranta escreveu:
> > On Wed, Oct 31, 2007 at 20:21:53 -0300, Leandro wrote:
> > > - *  net/dccp/ccids/ccid4.h
> > > + *  net/dccp/ccids/ccid4.c
> > 
> > Is this intentional? ccid2.h and ccid3.h both have ccidX.h.
> 
> I suggest just removing the file name altogether. Dave Jones has been
> doing this and I agree with him that the names in these files are not
> useful.

Agreed.

Re: [PATCH 3/25] Adjustments of the ccid-4 copyright and kernel module authors

[Łeandro Sales]

2007/11/1, Tommi Saviranta <wnd@iki.fi>:
> On Thu, Nov 01, 2007 at 10:24:44 -0200, Arnaldo Carvalho de Melo wrote:
> > Em Thu, Nov 01, 2007 at 02:22:49PM +0200, Tommi Saviranta escreveu:
> > > On Wed, Oct 31, 2007 at 20:21:53 -0300, Leandro wrote:
> > > > - *  net/dccp/ccids/ccid4.h
> > > > + *  net/dccp/ccids/ccid4.c
> > >
> > > Is this intentional? ccid2.h and ccid3.h both have ccidX.h.
> >
> > I suggest just removing the file name altogether. Dave Jones has been
> > doing this and I agree with him that the names in these files are not
> > useful.
>
> Agreed.
>
>

It was not intentional, it was a wrong copy & paste operation, and I
already notice this, but I didn't want to release a patch just to fix
this, then I fix and when I provide new changes, I would include this
one, but since Arnaldo mentioned that this can be removed, and you
agreed, I will remove it in the next patch set.

[]s
Leandro.

Re: [PATCH 3/25] Adjustments of the ccid-4 copyright and kernel module authors

[Ian McDonald]

On 11/1/07, Leandro <leandroal@gmail.com> wrote:
> + *  Copyrithg (c) 2007 Leandro Sales, Tommi Saviranta

Misspelling of copyright - this has been done several times in this patch.
-- 
Web1: http://wand.net.nz/~iam4/
Web2: http://www.jandi.co.nz
Blog: http://iansblog.jandi.co.nz

Re: [PATCH 3/25] Adjustments of the ccid-4 copyright and kernel module authors

[Gerrit Renker]

Quoting Ian McDonald:
| > + *  Copyrithg (c) 2007 Leandro Sales, Tommi Saviranta
| 
| Misspelling of copyright - this has been done several times in this patch.

I have done 	s/Copyrithg/Copyright/g  here.

If you want to take out the filenames in the comments as well, as suggested by
Arnaldo/Tommi, email me. Otherwise, I'll just wait for new patches.

Gerrit