Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cbbb04d authored by Eddie Wai's avatar Eddie Wai Committed by David S. Miller
Browse files

cnic: Update VLAN ID during ISCSI_UEVENT_PATH_UPDATE 



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

Signed-off-by: default avatarEddie Wai <eddie.wai@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0cb1f4b9

drivers/net/ethernet/broadcom/cnic.c

+2 −0
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/broadcom/cnic_if.h

+2 −2
Original line number Diff line number Diff line
@@ -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