diff options
| author | Michael Brown | 2007-09-21 02:27:03 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-09-21 02:27:03 +0200 |
| commit | 44461b1854ef04c811b26c686fc03cab6e34df3e (patch) | |
| tree | b3dc44496a0e707467c6ccf7d37f0c983beb3c12 | |
| parent | Reverted driver/net/mlx_ipoib to clean master state (diff) | |
| parent | Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe (diff) | |
| download | ipxe-44461b1854ef04c811b26c686fc03cab6e34df3e.tar.gz ipxe-44461b1854ef04c811b26c686fc03cab6e34df3e.tar.xz ipxe-44461b1854ef04c811b26c686fc03cab6e34df3e.zip | |
Merge branch 'master' into 3leaf-delivery
| -rw-r--r-- | src/include/gpxe/netdevice.h | 11 | ||||
| -rw-r--r-- | src/payload/hello.img | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/include/gpxe/netdevice.h b/src/include/gpxe/netdevice.h index 2cbd0efb..5d5e05bd 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 bc7774a7..00000000 --- a/src/payload/hello.img +++ /dev/null @@ -1 +0,0 @@ -hello world!
\ No newline at end of file |