Merge branch 'master' into openslx

1 files changed, 17 insertions, 0 deletions

diff --git a/src/include/ipxe/interface.h b/src/include/ipxe/interface.h
index b65002c80..19f58a4b4 100644
--- a/src/include/ipxe/interface.h
+++ b/src/include/ipxe/interface.h
@@ -36,6 +36,21 @@ struct interface_operation {
 			  ? op_func : op_func ),			      \
 	}
 
+/**
+ * Define an unused object interface operation
+ *
+ * @v op_type		Operation type
+ * @v object_type	Implementing method's expected object type
+ * @v op_func		Implementing method
+ * @ret op		Object interface operation
+ */
+#define UNUSED_INTF_OP( op_type, object_type, op_func ) {		      \
+		.type = NULL,						      \
+		.func = ( ( ( ( typeof ( op_func ) * ) NULL ) ==	      \
+			    ( ( op_type ## _TYPE ( object_type ) * ) NULL ) ) \
+			  ? NULL : NULL ),				      \
+	}
+
 /** An object interface descriptor */
 struct interface_descriptor {
 	/** Offset of interface within containing object */
@@ -154,6 +169,8 @@ extern void intfs_shutdown ( int rc, ... ) __attribute__ (( sentinel ));
 extern void intf_restart ( struct interface *intf, int rc );
 extern void intfs_vrestart ( va_list intfs, int rc );
 extern void intfs_restart ( int rc, ... ) __attribute__ (( sentinel ));
+extern void intf_insert ( struct interface *intf, struct interface *upper,
+			  struct interface *lower );
 
 extern void intf_poke ( struct interface *intf,
 			void ( type ) ( struct interface *intf ) );