Commit 558e4c75 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

cnic: Return proper error code if we fail to send netlink message 



to allow iSCSI connection to fail faster instead of waiting for the
long timeout.

Update version to 2.5.6.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Reviewed-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1dd883c

drivers/net/cnic.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static int cnic_send_nlmsg(struct cnic_local *cp, u32 type, 
		msleep(100);

		retry++;

	}

	return 0;

	return rc;

}



static void cnic_cm_upcall(struct cnic_local *, struct cnic_sock *, u8);

drivers/net/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.3"

#define CNIC_MODULE_RELDATE	"June 6, 2011"

#define CNIC_MODULE_VERSION	"2.5.6"

#define CNIC_MODULE_RELDATE	"July 12, 2011"



#define CNIC_ULP_RDMA		0

#define CNIC_ULP_ISCSI		1