svn commit: r213444 - in projects/ofed/head/sys: net ofed/include/linux

[Jeff Roberson]

Author: jeff
Date: Tue Oct  5 07:18:27 2010
New Revision: 213444
URL: http://svn.freebsd.org/changeset/base/213444

Log:
   - Add interface and arp header types for infiniband.
   - Increase the size of the lla address to 20 bytes for ib.  Possibly
     this should be ifdef'd to prevent bloat on non-ib platforms.
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas

Modified:
  projects/ofed/head/sys/net/if_arp.h
  projects/ofed/head/sys/net/if_llatbl.h
  projects/ofed/head/sys/net/if_types.h
  projects/ofed/head/sys/ofed/include/linux/if_arp.h

Modified: projects/ofed/head/sys/net/if_arp.h
==============================================================================
--- projects/ofed/head/sys/net/if_arp.h	Tue Oct  5 06:44:47 2010	(r213443)
+++ projects/ofed/head/sys/net/if_arp.h	Tue Oct  5 07:18:27 2010	(r213444)
@@ -50,6 +50,7 @@ struct	arphdr {
 #define ARPHRD_ARCNET	7	/* arcnet hardware format */
 #define ARPHRD_FRELAY 	15	/* frame relay hardware format */
 #define ARPHRD_IEEE1394	24	/* firewire hardware format */
+#define	ARPHRD_INFINIBAND 32	/* infiniband hardware format */
 	u_short	ar_pro;		/* format of protocol address */
 	u_char	ar_hln;		/* length of hardware address */
 	u_char	ar_pln;		/* length of protocol address */

Modified: projects/ofed/head/sys/net/if_llatbl.h
==============================================================================
--- projects/ofed/head/sys/net/if_llatbl.h	Tue Oct  5 06:44:47 2010	(r213443)
+++ projects/ofed/head/sys/net/if_llatbl.h	Tue Oct  5 07:18:27 2010	(r213444)
@@ -71,6 +71,7 @@ struct llentry {
 	union {
 		uint64_t	mac_aligned;
 		uint16_t	mac16[3];
+		uint8_t		mac8[20];	/* IB needs 20 bytes. */
 	} ll_addr;
 
 	/* XXX af-private? */

Modified: projects/ofed/head/sys/net/if_types.h
==============================================================================
--- projects/ofed/head/sys/net/if_types.h	Tue Oct  5 06:44:47 2010	(r213443)
+++ projects/ofed/head/sys/net/if_types.h	Tue Oct  5 07:18:27 2010	(r213444)
@@ -238,6 +238,7 @@
 #define	IFT_ATMVCIENDPT		   0xc2 /* ATM VCI End Point */
 #define	IFT_OPTICALCHANNEL	   0xc3 /* Optical Channel */
 #define	IFT_OPTICALTRANSPORT	   0xc4 /* Optical Transport */
+#define	IFT_INFINIBAND		   0xc7	/* Infiniband */
 #define	IFT_BRIDGE		   0xd1 /* Transparent bridge interface */
 
 #define	IFT_STF			   0xd7	/* 6to4 interface */

Modified: projects/ofed/head/sys/ofed/include/linux/if_arp.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/if_arp.h	Tue Oct  5 06:44:47 2010	(r213443)
+++ projects/ofed/head/sys/ofed/include/linux/if_arp.h	Tue Oct  5 07:18:27 2010	(r213444)
@@ -29,5 +29,4 @@
 #define	_LINUX_IF_ARP_H_
 #include <sys/socket.h>
 #include <net/if_arp.h>
-#define	ARPHRD_INFINIBAND	32
 #endif	/* _LINUX_IF_ARP_H_ */