From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752162Ab1GWJJX (ORCPT ); Sat, 23 Jul 2011 05:09:23 -0400 Received: from mail.linux-iscsi.org ([67.23.28.174]:34236 "EHLO linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752051Ab1GWJJQ (ORCPT ); Sat, 23 Jul 2011 05:09:16 -0400 From: "Nicholas A. Bellinger" To: target-devel , linux-scsi , linux-kernel Cc: Christoph Hellwig , Andy Grover , Hannes Reinecke , Roland Dreier , James Bottomley , Andrew Morton , Linus Torvalds , Nicholas Bellinger Subject: [PATCH 02/13] iscsi: Add Serial Number Arithmetic LT and GT into iscsi_proto.h Date: Sat, 23 Jul 2011 08:45:36 +0000 Message-Id: <1311410747-29947-3-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1311410747-29947-1-git-send-email-nab@linux-iscsi.org> References: <1311410747-29947-1-git-send-email-nab@linux-iscsi.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicholas Bellinger This patch moves the iscsi_sna_lt() and iscsi_sna_lte(), along with iscsi_sna_gt() and iscsi_sna_gte() from iscsi_target_mod into static inlines inside of include/scsi/iscsi_proto.h This patch also includes the ISCSI_HDR_LEN and ISCSI_CRC_LEN definitions. Signed-off-by: Mark Rustad Signed-off-by: Mike Christie Signed-off-by: Nicholas A. Bellinger --- drivers/scsi/libiscsi.c | 16 ---------------- include/scsi/iscsi_proto.h | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 9c3cb4e..3461a03 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -84,22 +84,6 @@ MODULE_PARM_DESC(debug_libiscsi_eh, __func__, ##arg); \ } while (0); -/* Serial Number Arithmetic, 32 bits, less than, RFC1982 */ -#define SNA32_CHECK 2147483648UL - -static int iscsi_sna_lt(u32 n1, u32 n2) -{ - return n1 != n2 && ((n1 < n2 && (n2 - n1 < SNA32_CHECK)) || - (n1 > n2 && (n2 - n1 < SNA32_CHECK))); -} - -/* Serial Number Arithmetic, 32 bits, less than, RFC1982 */ -static int iscsi_sna_lte(u32 n1, u32 n2) -{ - return n1 == n2 || ((n1 < n2 && (n2 - n1 < SNA32_CHECK)) || - (n1 > n2 && (n2 - n1 < SNA32_CHECK))); -} - inline void iscsi_conn_queue_work(struct iscsi_conn *conn) { struct Scsi_Host *shost = conn->session->host; diff --git a/include/scsi/iscsi_proto.h b/include/scsi/iscsi_proto.h index a9c9058..455b03a 100644 --- a/include/scsi/iscsi_proto.h +++ b/include/scsi/iscsi_proto.h @@ -29,10 +29,48 @@ /* default iSCSI listen port for incoming connections */ #define ISCSI_LISTEN_PORT 3260 +/* iSCSI header length */ +#define ISCSI_HDR_LEN 48 + +/* iSCSI CRC32C length */ +#define ISCSI_CRC_LEN 4 + /* Padding word length */ #define ISCSI_PAD_LEN 4 /* + * Serial Number Arithmetic, 32 bits, RFC1982 + */ + +static inline int iscsi_sna_lt(u32 n1, u32 n2) +{ + s32 diff = n1 - n2; + + return diff < 0; +} + +static inline int iscsi_sna_lte(u32 n1, u32 n2) +{ + s32 diff = n1 - n2; + + return diff <= 0; +} + +static inline int iscsi_sna_gt(u32 n1, u32 n2) +{ + s32 diff = n1 - n2; + + return diff > 0; +} + +static inline int iscsi_sna_gte(u32 n1, u32 n2) +{ + s32 diff = n1 - n2; + + return diff >= 0; +} + +/* * useful common(control and data pathes) macro */ #define ntoh24(p) (((p)[0] << 16) | ((p)[1] << 8) | ((p)[2])) -- 1.7.6