Commit a8c2190e authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[INET_DIAG]: Rename tcp_diag.[ch] to inet_diag.[ch] 



Next changeset will introduce net/ipv4/tcp_diag.c, moving the code that was put
transitioanlly in inet_diag.c.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 73c1f4a0

net/dccp/diag.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <linux/config.h>



#include <linux/module.h>

#include <linux/tcp_diag.h>

#include <linux/inet_diag.h>



#include "dccp.h"

net/ipv4/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ obj-$(CONFIG_IP_ROUTE_MULTIPATH_WRANDOM) += multipath_wrandom.o 
obj-$(CONFIG_IP_ROUTE_MULTIPATH_DRR) += multipath_drr.o

obj-$(CONFIG_NETFILTER)	+= netfilter/

obj-$(CONFIG_IP_VS) += ipvs/

obj-$(CONFIG_IP_INET_DIAG) += tcp_diag.o 

obj-$(CONFIG_IP_INET_DIAG) += inet_diag.o 

obj-$(CONFIG_IP_ROUTE_MULTIPATH_CACHED) += multipath.o

obj-$(CONFIG_TCP_CONG_BIC) += tcp_bic.o

obj-$(CONFIG_TCP_CONG_WESTWOOD) += tcp_westwood.o

net/ipv4/tcp_diag.c→net/ipv4/inet_diag.c

+12 −11
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <linux/inet.h>

#include <linux/stddef.h>



#include <linux/tcp_diag.h>

#include <linux/inet_diag.h>



static const struct inet_diag_handler **inet_diag_table;
@@ -311,11 +311,11 @@ static int inet_diag_bc_run(const void *bc, int len, 
			yes = !(entry->userlocks & SOCK_BINDPORT_LOCK);

			break;

		case INET_DIAG_BC_S_COND:

		case INET_DIAG_BC_D_COND:

		{

			struct inet_diag_hostcond *cond = (struct inet_diag_hostcond*)(op+1);

		case INET_DIAG_BC_D_COND: {

			struct inet_diag_hostcond *cond;

			u32 *addr;



			cond = (struct inet_diag_hostcond *)(op + 1);

			if (cond->port != -1 &&

			    cond->port != (op->code == INET_DIAG_BC_S_COND ?

					     entry->sport : entry->dport)) {
@@ -337,7 +337,8 @@ static int inet_diag_bc_run(const void *bc, int len, 
			    cond->family == AF_INET) {

				if (addr[0] == 0 && addr[1] == 0 &&

				    addr[2] == htonl(0xffff) &&

				    bitstring_match(addr+3, cond->addr, cond->prefix_len))

				    bitstring_match(addr + 3, cond->addr,

					    	    cond->prefix_len))

					break;

			}

			yes = 0;

net/ipv4/tcp_vegas.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <linux/mm.h>

#include <linux/module.h>

#include <linux/skbuff.h>

#include <linux/tcp_diag.h>

#include <linux/inet_diag.h>



#include <net/tcp.h>