summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/cnic.c
diff options
context:
space:
mode:
authorEddie Wai2012-02-08 18:33:57 +0100
committerDavid S. Miller2012-02-09 20:03:50 +0100
commit4cbbb04dc115423682349aa7466c8aeead825140 (patch)
tree92d59061d53b37ceccb7eb3973c053c4f6b0beda /drivers/net/ethernet/broadcom/cnic.c
parentcnic: set error flag when iSCSI connection fails (diff)
downloadkernel-qcow2-linux-4cbbb04dc115423682349aa7466c8aeead825140.tar.gz
kernel-qcow2-linux-4cbbb04dc115423682349aa7466c8aeead825140.tar.xz
kernel-qcow2-linux-4cbbb04dc115423682349aa7466c8aeead825140.zip
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom/cnic.c')
-rw-r--r--drivers/net/ethernet/broadcom/cnic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index e2365609a0be..df429959abdd 100644
--- 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,