[TFRC]: Fix and simplify header includes This updates the header-include structure so that any module wishing to use the service of the tfrc_lib module needs only include "tfrc.h" and has access to all declarations it needs. Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx> --- net/dccp/ccids/ccid3.c | 4 ---- net/dccp/ccids/ccid3.h | 7 +++---- net/dccp/ccids/lib/loss_interval.c | 5 +---- net/dccp/ccids/lib/loss_interval.h | 1 - net/dccp/ccids/lib/packet_history.c | 1 - net/dccp/ccids/lib/packet_history.h | 6 ++---- net/dccp/ccids/lib/tfrc.h | 5 +++++ 7 files changed, 11 insertions(+), 18 deletions(-) --- a/net/dccp/ccids/lib/tfrc.h +++ b/net/dccp/ccids/lib/tfrc.h @@ -16,6 +16,11 @@ #include <linux/types.h> #include <asm/div64.h> #include "../../dccp.h" +/* internal includes that this module exports: */ +struct tfrc_rx_hist; +struct tfrc_loss_hist; +#include "loss_interval.h" +#include "packet_history.h" #ifdef CONFIG_IP_DCCP_TFRC_DEBUG extern int tfrc_debug; --- a/net/dccp/ccids/lib/loss_interval.c +++ b/net/dccp/ccids/lib/loss_interval.c @@ -10,11 +10,8 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ - -#include <linux/module.h> #include <net/sock.h> -#include "../../dccp.h" -#include "loss_interval.h" +#include "tfrc.h" static struct kmem_cache *tfrc_lh_slab; /* Loss Interval weights from [RFC 3448, 5.4], scaled by 10 */ --- a/net/dccp/ccids/ccid3.h +++ b/net/dccp/ccids/ccid3.h @@ -1,3 +1,5 @@ +#ifndef _DCCP_CCID3_H_ +#define _DCCP_CCID3_H_ /* * net/dccp/ccids/ccid3.h * @@ -33,15 +35,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _DCCP_CCID3_H_ -#define _DCCP_CCID3_H_ - #include <linux/ktime.h> #include <linux/list.h> #include <linux/time.h> #include <linux/types.h> #include <linux/tfrc.h> -#include "lib/packet_history.h" +#include "lib/tfrc.h" #include "../ccid.h" /* Two seconds as per RFC 3448 4.2 */ --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c @@ -33,11 +33,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "../ccid.h" #include "../dccp.h" -#include "lib/packet_history.h" -#include "lib/loss_interval.h" -#include "lib/tfrc.h" #include "ccid3.h" #ifdef CONFIG_IP_DCCP_CCID3_DEBUG --- a/net/dccp/ccids/lib/packet_history.c +++ b/net/dccp/ccids/lib/packet_history.c @@ -33,7 +33,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #include <linux/string.h> #include "packet_history.h" --- a/net/dccp/ccids/lib/packet_history.h +++ b/net/dccp/ccids/lib/packet_history.h @@ -1,3 +1,5 @@ +#ifndef _DCCP_PKT_HIST_ +#define _DCCP_PKT_HIST_ /* * net/dccp/packet_history.h * @@ -33,10 +35,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#ifndef _DCCP_PKT_HIST_ -#define _DCCP_PKT_HIST_ - #include <linux/list.h> #include <linux/slab.h> #include <linux/time.h> --- a/net/dccp/ccids/lib/loss_interval.h +++ b/net/dccp/ccids/lib/loss_interval.h @@ -12,7 +12,6 @@ * Software Foundation; either version 2 of the License, or (at your option) * any later version. */ - #include <linux/list.h> #include <linux/slab.h> #include <linux/time.h> - 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
