Commit 1823730f authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[IPv4]: Move interface address bits to linux/if_addr.h 



Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47f68512

include/linux/if_addr.h

0 → 100644
+53 −0
Original line number Diff line number Diff line 
#ifndef __LINUX_IF_ADDR_H

#define __LINUX_IF_ADDR_H



#include <linux/netlink.h>



struct ifaddrmsg

{

	__u8		ifa_family;

	__u8		ifa_prefixlen;	/* The prefix length		*/

	__u8		ifa_flags;	/* Flags			*/

	__u8		ifa_scope;	/* Address scope		*/

	__u32		ifa_index;	/* Link index			*/

};



/*

 * Important comment:

 * IFA_ADDRESS is prefix address, rather than local interface address.

 * It makes no difference for normally configured broadcast interfaces,

 * but for point-to-point IFA_ADDRESS is DESTINATION address,

 * local address is supplied in IFA_LOCAL attribute.

 */

enum

{

	IFA_UNSPEC,

	IFA_ADDRESS,

	IFA_LOCAL,

	IFA_LABEL,

	IFA_BROADCAST,

	IFA_ANYCAST,

	IFA_CACHEINFO,

	IFA_MULTICAST,

	__IFA_MAX,

};



#define IFA_MAX (__IFA_MAX - 1)



/* ifa_flags */

#define IFA_F_SECONDARY		0x01

#define IFA_F_TEMPORARY		IFA_F_SECONDARY



#define IFA_F_DEPRECATED	0x20

#define IFA_F_TENTATIVE		0x40

#define IFA_F_PERMANENT		0x80



struct ifa_cacheinfo

{

	__u32	ifa_prefered;

	__u32	ifa_valid;

	__u32	cstamp; /* created timestamp, hundredths of seconds */

	__u32	tstamp; /* updated timestamp, hundredths of seconds */

};



#endif

include/linux/rtnetlink.h

+0 −56
Original line number Diff line number Diff line
@@ -384,62 +384,6 @@ struct rta_session 
};





/*********************************************************

 *		Interface address.

 ****/



struct ifaddrmsg

{

	unsigned char	ifa_family;

	unsigned char	ifa_prefixlen;	/* The prefix length		*/

	unsigned char	ifa_flags;	/* Flags			*/

	unsigned char	ifa_scope;	/* See above			*/

	int		ifa_index;	/* Link index			*/

};



enum

{

	IFA_UNSPEC,

	IFA_ADDRESS,

	IFA_LOCAL,

	IFA_LABEL,

	IFA_BROADCAST,

	IFA_ANYCAST,

	IFA_CACHEINFO,

	IFA_MULTICAST,

	__IFA_MAX

};



#define IFA_MAX (__IFA_MAX - 1)



/* ifa_flags */



#define IFA_F_SECONDARY		0x01

#define IFA_F_TEMPORARY		IFA_F_SECONDARY



#define IFA_F_DEPRECATED	0x20

#define IFA_F_TENTATIVE		0x40

#define IFA_F_PERMANENT		0x80



struct ifa_cacheinfo

{

	__u32	ifa_prefered;

	__u32	ifa_valid;

	__u32	cstamp; /* created timestamp, hundredths of seconds */

	__u32	tstamp; /* updated timestamp, hundredths of seconds */

};





#define IFA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))

#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))



/*

   Important comment:

   IFA_ADDRESS is prefix address, rather than local interface address.

   It makes no difference for normally configured broadcast interfaces,

   but for point-to-point IFA_ADDRESS is DESTINATION address,

   local address is supplied in IFA_LOCAL attribute.

 */



/**************************************************************

 *		Neighbour discovery.

net/core/rtnetlink.c

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

#include <linux/security.h>

#include <linux/mutex.h>

#include <linux/if_addr.h>



#include <asm/uaccess.h>

#include <asm/system.h>

net/decnet/dn_dev.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/seq_file.h>

#include <linux/timer.h>

#include <linux/string.h>

#include <linux/if_addr.h>

#include <linux/if_arp.h>

#include <linux/if_ether.h>

#include <linux/skbuff.h>

net/ipv4/devinet.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <linux/in.h>

#include <linux/errno.h>

#include <linux/interrupt.h>

#include <linux/if_addr.h>

#include <linux/if_ether.h>

#include <linux/inet.h>

#include <linux/netdevice.h>