cnic: Update VLAN ID during ISCSI_UEVENT_PATH_UPDATE

This will support the new VLAN attribute in the iSCSI iface file.

(cherry picked from commit 4cbbb04dc115423682349aa7466c8aeead825140)
Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 107d60c643c0e1842c7542db46de13a31dd68f01..6a31f37ebc4ec48e3cc5f3373e664b2c815fb427 100644 (file)
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -365,6 +365,8 @@ static int cnic_iscsi_nl_msg_recv(struct cnic_dev *dev, u32 msg_type,
                if (cnic_in_use(csk) &&
                    test_bit(SK_F_CONNECT_START, &csk->flags)) {
 
+                       csk->vlan_id = path_resp->vlan_id;
+
                        memcpy(csk->ha, path_resp->mac_addr, 6);
                        if (test_bit(SK_F_IPV6, &csk->flags))
                                memcpy(&csk->src_ip[0], &path_resp->src.v6_addr,

diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h
index 6949c554b6f72e3ee30e117ff30091826f853a17..c1dda36806beb45b2174f89709cc6bfffbd1dd0b 100644 (file)
--- 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.8"
-#define CNIC_MODULE_RELDATE    "Jan 3, 2012"
+#define CNIC_MODULE_VERSION    "2.5.9"
+#define CNIC_MODULE_RELDATE    "Feb 8, 2012"
 
 #define CNIC_ULP_RDMA          0
 #define CNIC_ULP_ISCSI         1