From: Eddie Wai Date: Wed, 8 Feb 2012 17:33:57 +0000 (+0000) Subject: cnic: Update VLAN ID during ISCSI_UEVENT_PATH_UPDATE X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~629 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4d874556f63974c891a2f8f9f0ab4fd9c9db05ab;p=users%2Fjedix%2Flinux-maple.git 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 Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 107d60c643c0..6a31f37ebc4e 100644 --- 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 6949c554b6f7..c1dda36806be 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.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