V4L/DVB: v4l videobuf: rename .vmalloc to .vaddr

[safe/jmp/linux-2.6] / drivers / net / enic / vnic_dev.c

diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index c8d3fc7..cf22de7 100644 (file)
--- a/drivers/net/enic/vnic_dev.c
+++ b/drivers/net/enic/vnic_dev.c
@@ -23,6 +23,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/if_ether.h>
+#include <linux/slab.h>
 
 #include "vnic_resource.h"
 #include "vnic_devcmd.h"
@@ -36,7 +37,6 @@ struct vnic_res {
 };
 
 #define VNIC_DEV_CAP_INIT      0x0001
-#define VNIC_DEV_CAP_PERBI     0x0002
 
 struct vnic_dev {
        void *priv;
@@ -560,6 +560,20 @@ void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
                printk(KERN_ERR "Can't del addr [%pM], %d\n", addr, err);
 }
 
+int vnic_dev_raise_intr(struct vnic_dev *vdev, u16 intr)
+{
+       u64 a0 = intr, a1 = 0;
+       int wait = 1000;
+       int err;
+
+       err = vnic_dev_cmd(vdev, CMD_IAR, &a0, &a1, wait);
+       if (err)
+               printk(KERN_ERR "Failed to raise INTR[%d], err %d\n",
+                       intr, err);
+
+       return err;
+}
+
 int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
 {
        u64 a0, a1;