summaryrefslogtreecommitdiff
path: root/drivers/net/cnic_if.h
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2011-07-20 18:55:24 +0400
committerDavid S. Miller <davem@davemloft.net>2011-07-21 23:38:32 +0400
commit415199f2bd977fa4065d4e836b4b7543f7993bc3 (patch)
tree2dfb4dfcc7097fcdd02d7923e6fdecebc4af0985 /drivers/net/cnic_if.h
parent74e49bbdabbac34c77b280152b1de9bef9bf9be7 (diff)
downloadlinux-415199f2bd977fa4065d4e836b4b7543f7993bc3.tar.xz
cnic: Add VLAN ID as a parameter during netevent upcall
The bnx2fc driver needs to handle netdev events on VLAN devices. Signed-off-by: Michael Chan <mchan@broadcom.com> Reviewed-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cnic_if.h')
-rw-r--r--drivers/net/cnic_if.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h
index 8a1ffbe123bb..79443e0dbf96 100644
--- a/drivers/net/cnic_if.h
+++ b/drivers/net/cnic_if.h
@@ -12,8 +12,8 @@
#ifndef CNIC_IF_H
#define CNIC_IF_H
-#define CNIC_MODULE_VERSION "2.5.6"
-#define CNIC_MODULE_RELDATE "July 12, 2011"
+#define CNIC_MODULE_VERSION "2.5.7"
+#define CNIC_MODULE_RELDATE "July 20, 2011"
#define CNIC_ULP_RDMA 0
#define CNIC_ULP_ISCSI 1
@@ -318,7 +318,7 @@ struct cnic_ulp_ops {
void (*cnic_stop)(void *ulp_ctx);
void (*indicate_kcqes)(void *ulp_ctx, struct kcqe *cqes[],
u32 num_cqes);
- void (*indicate_netevent)(void *ulp_ctx, unsigned long event);
+ void (*indicate_netevent)(void *ulp_ctx, unsigned long event, u16 vid);
void (*cm_connect_complete)(struct cnic_sock *);
void (*cm_close_complete)(struct cnic_sock *);
void (*cm_abort_complete)(struct cnic_sock *);