summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2007-09-21 02:26:06 +0200
committerMichael Brown2007-09-21 02:26:06 +0200
commit1e677b2024f5f049ba7e3feb29a4193a3f968221 (patch)
tree72af1e9dee4003ecc4c14058f576ade9be3552cf
parentInfinband requires longer link-layer addresses and headers than Ethernet. (diff)
parentAdded netdev_priv() to ease Linux driver compatibility. (diff)
downloadipxe-1e677b2024f5f049ba7e3feb29a4193a3f968221.tar.gz
ipxe-1e677b2024f5f049ba7e3feb29a4193a3f968221.tar.xz
ipxe-1e677b2024f5f049ba7e3feb29a4193a3f968221.zip
Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe
-rw-r--r--src/include/gpxe/netdevice.h11
-rw-r--r--src/payload/hello.img1
2 files changed, 11 insertions, 1 deletions
diff --git a/src/include/gpxe/netdevice.h b/src/include/gpxe/netdevice.h
index 2cbd0efb1..5d5e05bd5 100644
--- a/src/include/gpxe/netdevice.h
+++ b/src/include/gpxe/netdevice.h
@@ -326,6 +326,17 @@ netdev_put ( struct net_device *netdev ) {
ref_put ( &netdev->refcnt );
}
+/**
+ * Get driver private area for this network device
+ *
+ * @v netdev Network device
+ * @ret priv Driver private area for this network device
+ */
+static inline __attribute__ (( always_inline )) void *
+netdev_priv ( struct net_device *netdev ) {
+ return netdev->priv;
+}
+
extern int netdev_tx ( struct net_device *netdev, struct io_buffer *iobuf );
extern void netdev_tx_complete_err ( struct net_device *netdev,
struct io_buffer *iobuf, int rc );
diff --git a/src/payload/hello.img b/src/payload/hello.img
deleted file mode 100644
index bc7774a7b..000000000
--- a/src/payload/hello.img
+++ /dev/null
@@ -1 +0,0 @@
-hello world! \ No newline at end of file