[PATCH 7/25] Initial lib for sharing common code between ccid-3/ccid-4

[PATCH 7/25] Initial lib for sharing common code between ccid-3/ccid-4

[Leandro]

[CCID-3/4 lib] Initial lib for sharing common code between ccid-3/ccid-4

The lib is called tfrc_ccids.o

Signed-off-by: Leandro Melo de Sales <leandro@embedded.ufcg.edu.br>

Index: leandro.new/net/dccp/ccids/lib/Makefile
=================================--- leandro.new.orig/net/dccp/ccids/lib/Makefile
+++ leandro.new/net/dccp/ccids/lib/Makefile
@@ -1,4 +1,5 @@
 obj-$(CONFIG_IP_DCCP_TFRC_LIB) += dccp_tfrc_lib.o
 
 dccp_tfrc_lib-y := tfrc_module.o    tfrc_equation.o \
-                   packet_history.o loss_interval.o
+                   packet_history.o loss_interval.o \
+		   tfrc_ccids.o
Index: leandro.new/net/dccp/ccids/lib/tfrc_ccids.c
=================================--- /dev/null
+++ leandro.new/net/dccp/ccids/lib/tfrc_ccids.c
@@ -0,0 +1,14 @@
+/*
+ *  net/dccp/ccids/lib/tfrc_ccids.c
+ *
+ *  Copyright (c) 2007 Leandro Melo de Sales <leandroal@gmail.com>
+ *  Copyright (c) 2005 Ian McDonald <ian.mcdonald@jandi.co.nz>
+ *  Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
+ *  Copyright (c) 2003 Nils-Erik Mattsson, Joacim Haggmark, Magnus Erixzon
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ */
+#include "tfrc_ccids.h"
Index: leandro.new/net/dccp/ccids/lib/tfrc_ccids.h
=================================--- /dev/null
+++ leandro.new/net/dccp/ccids/lib/tfrc_ccids.h
@@ -0,0 +1,24 @@
+/*
+ *  net/dccp/ccids/lib/tfrc_ccids.h
+ *
+ *  Copyright (c) 2007 Leandro Melo de Sales <leandroal@gmail.com>
+ *  Copyright (c) 2005 Ian McDonald <ian.mcdonald@jandi.co.nz>
+ *  Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
+ *  Copyright (c) 2003 Nils-Erik Mattsson, Joacim Haggmark, Magnus Erixzon
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ */
+#ifndef _TFRC_CCIDS_H_
+#define _TFRC_CCIDS_H_
+
+#include <linux/ktime.h>
+#include <linux/list.h>
+#include <linux/types.h>
+#include <linux/tfrc.h>
+#include <asm/unaligned.h>
+#include "tfrc.h"
+
+#endif /* _TFRC_CCIDS_H_ */

Re: [PATCH 7/25] Initial lib for sharing common code between

[Tommi Saviranta]

On Wed, Oct 31, 2007 at 21:30:24 -0300, Leandro wrote:
> [CCID-3/4 lib] Initial lib for sharing common code between ccid-3/ccid-4
> 
> The lib is called tfrc_ccids.o

> Index: leandro.new/net/dccp/ccids/lib/Makefile
> =================================> --- leandro.new.orig/net/dccp/ccids/lib/Makefile
> +++ leandro.new/net/dccp/ccids/lib/Makefile
> @@ -1,4 +1,5 @@
>  obj-$(CONFIG_IP_DCCP_TFRC_LIB) += dccp_tfrc_lib.o
>  
>  dccp_tfrc_lib-y := tfrc_module.o    tfrc_equation.o \
> -                   packet_history.o loss_interval.o
> +                   packet_history.o loss_interval.o \
> +		   tfrc_ccids.o

Whitespace police hits! I don't remember Documentation/CodingStyle
mentioning anything about whitespaces in Makefiles. Nevertheless,
packet_history.o is indented here with spaces, tfrc_ccids.o with
tabulators, I think we should stick to just one kind of whitespace.

> -                   packet_history.o loss_interval.o
> +                   packet_history.o loss_interval.o \
> +                   tfrc_ccids.o

[PATCH 7/25] Initial lib for sharing common code between ccid-3/ccid-4

[Łeandro Sales]

Just forward a private e-mail with Tommi about his comments.

2007/11/1, Tommi Saviranta <wnd@iki.fi>:
> On Wed, Oct 31, 2007 at 21:30:24 -0300, Leandro wrote:
> > [CCID-3/4 lib] Initial lib for sharing common code between ccid-3/ccid-4
> >
> > The lib is called tfrc_ccids.o
>
> > Index: leandro.new/net/dccp/ccids/lib/Makefile
> > =================================> > --- leandro.new.orig/net/dccp/ccids/lib/Makefile
> > +++ leandro.new/net/dccp/ccids/lib/Makefile
> > @@ -1,4 +1,5 @@
> >  obj-$(CONFIG_IP_DCCP_TFRC_LIB) += dccp_tfrc_lib.o
> >
> >  dccp_tfrc_lib-y := tfrc_module.o    tfrc_equation.o \
> > -                   packet_history.o loss_interval.o
> > +                   packet_history.o loss_interval.o \
> > +                tfrc_ccids.o
>
> Whitespace police hits! I don't remember Documentation/CodingStyle
> mentioning anything about whitespaces in Makefiles. Nevertheless,
> packet_history.o is indented here with spaces, tfrc_ccids.o with
> tabulators, I think we should stick to just one kind of whitespace.
>
> > -                   packet_history.o loss_interval.o
> > +                   packet_history.o loss_interval.o \
> > +                   tfrc_ccids.o
>
>

From Documentation/CodingStyle:

"Tabs are 8 characters, and thus indentations are also 8 characters.
There are heretic movements that try to make indentations 4 (or even 2!)
characters deep, and that is akin to trying to define the value of PI to
be 3."

(...)

"In short, 8-char indents make things easier to read, and have the added
benefit of warning you when you're nesting your functions too deep.
Heed that warning."

So, the kind that we are looking for it to use tabs (8 chars). Since
tfrc_ccids.o I used tabs, I think that it is ok.

Leandro.

Re: [PATCH 7/25] Initial lib for sharing common code between ccid-3/ccid-4

[Ian McDonald]

On 11/1/07, Leandro <leandroal@gmail.com> wrote:
> [CCID-3/4 lib] Initial lib for sharing common code between ccid-3/ccid-4
>
> The lib is called tfrc_ccids.o
>
> Signed-off-by: Leandro Melo de Sales <leandro@embedded.ufcg.edu.br>
>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>

Re: [PATCH 7/25] Initial lib for sharing common code between ccid-3/ccid-4

[Gerrit Renker]

Quoting Tommi:
| On Wed, Oct 31, 2007 at 21:30:24 -0300, Leandro wrote:
| > [CCID-3/4 lib] Initial lib for sharing common code between ccid-3/ccid-4
| > 
| > The lib is called tfrc_ccids.o
| 
| > Index: leandro.new/net/dccp/ccids/lib/Makefile
| > =================================| > --- leandro.new.orig/net/dccp/ccids/lib/Makefile
| > +++ leandro.new/net/dccp/ccids/lib/Makefile
| > @@ -1,4 +1,5 @@
| >  obj-$(CONFIG_IP_DCCP_TFRC_LIB) += dccp_tfrc_lib.o
| >  
| >  dccp_tfrc_lib-y := tfrc_module.o    tfrc_equation.o \
| > -                   packet_history.o loss_interval.o
| > +                   packet_history.o loss_interval.o \
| > +		   tfrc_ccids.o
| 
| Whitespace police hits! I don't remember Documentation/CodingStyle
| mentioning anything about whitespaces in Makefiles. Nevertheless,
| packet_history.o is indented here with spaces, tfrc_ccids.o with
| tabulators, I think we should stick to just one kind of whitespace.
| 
| > -                   packet_history.o loss_interval.o
| > +                   packet_history.o loss_interval.o \
| > +                   tfrc_ccids.o
| 
Leandro is right, tabs are ok in this place (it is a line continuation).
I just found that in the online version the patch looks as suggested
above (I run my whitespace scripts routinely over patch sets, and have
done this here as well).