Merge from vendor branch Linux:

Import of Linux 2.2.14 subset (ipv4 stack and related)

1 files changed, 0 insertions, 25 deletions

diff --git a/pfinet/linux-src/include/linux/if.h b/pfinet/linux-src/include/linux/if.h
index cd5f3139..c95f372c 100644
--- a/pfinet/linux-src/include/linux/if.h
+++ b/pfinet/linux-src/include/linux/if.h
@@ -45,31 +45,6 @@
 #define IFF_AUTOMEDIA	0x4000		/* auto media select active	*/
 #define IFF_DYNAMIC	0x8000		/* dialup device with changing addresses*/
 
-#ifdef __KERNEL__
-/*
- * The ifaddr structure contains information about one address
- * of an interface.  They are maintained by the different address
- * families, are allocated and attached when an address is set,
- * and are linked together so all addresses for an interface can
- * be located.
- */
- 
-struct ifaddr 
-{
-	struct sockaddr	ifa_addr;	/* address of interface		*/
-	union {
-		struct sockaddr	ifu_broadaddr;
-		struct sockaddr	ifu_dstaddr;
-	} ifa_ifu;
-	struct iface		*ifa_ifp;	/* back-pointer to interface	*/
-	struct ifaddr		*ifa_next;	/* next address for interface	*/
-};
-
-#define	ifa_broadaddr	ifa_ifu.ifu_broadaddr	/* broadcast address	*/
-#define	ifa_dstaddr	ifa_ifu.ifu_dstaddr	/* other end of link	*/
-
-#endif /* __KERNEL__ */ 
-
 /*
  *	Device mapping structure. I'd just gone off and designed a 
  *	beautiful scheme using only loadable modules with arguments