cnic: Update VLAN ID during ISCSI_UEVENT_PATH_UPDATE

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

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>

diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index e2365609a0be025943798c01dff12a83275d0c69..df429959abdd9f8c2cbb64937ba23fcc45b84c32 100644 (file)
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -380,6 +380,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/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h
index 1517763d4e555507146de73464ce3abe347863b6..60deb84d36bd651d0f09d08cc5792165dfdd0674 100644 (file)
--- a/drivers/net/ethernet/broadcom/cnic_if.h
+++ b/drivers/net/ethernet/broadcom/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