aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2015-02-13 22:38:19 +0000
committerXin LI <delphij@FreeBSD.org>2015-02-13 22:38:19 +0000
commit3f25b69574795f4231ea2c09a86c5a4e2f14b7f8 (patch)
treef08b80cad133bae3573bd08b93adff166dd05bcb
parent438af398a514d1eea2702f5f49af4807fd14e111 (diff)
downloadports-3f25b69574795f4231ea2c09a86c5a4e2f14b7f8.tar.gz
ports-3f25b69574795f4231ea2c09a86c5a4e2f14b7f8.zip
Notes
-rw-r--r--net/iet/Makefile2
-rw-r--r--net/iet/files/patch-freebsd1114
2 files changed, 15 insertions, 1 deletions
diff --git a/net/iet/Makefile b/net/iet/Makefile
index 6accc7c97243..436d4760854b 100644
--- a/net/iet/Makefile
+++ b/net/iet/Makefile
@@ -3,7 +3,7 @@
PORTNAME= iet
PORTVERSION= 1.4.20.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net kld
MASTER_SITES= SF/iscsitarget/iscsitarget/${PORTVERSION}/
DISTNAME= iscsitarget-${PORTVERSION}
diff --git a/net/iet/files/patch-freebsd11 b/net/iet/files/patch-freebsd11
index 4a04d8f037ea..26bd1785b3bc 100644
--- a/net/iet/files/patch-freebsd11
+++ b/net/iet/files/patch-freebsd11
@@ -10,3 +10,17 @@
#define DATA_PROTECT SSD_KEY_DATA_PROTECT
#define NO_SENSE SSD_KEY_NO_SENSE
#define MEDIUM_ERROR SSD_KEY_MEDIUM_ERROR
+--- kernel/conn.c.orig 2015-02-13 14:23:20.438348146 -0800
++++ kernel/conn.c 2015-02-13 14:33:52.728261609 -0800
+@@ -80,7 +80,11 @@
+
+ if ((so->so_state & SS_ISDISCONNECTING) ||(so->so_state & SS_ISDISCONNECTED))
+ conn_close(conn);
++#if __FreeBSD_version >= 1100048
++ else if (soreadable(so))
++#else
+ else if (so->so_rcv.sb_cc || !(so->so_rcv.sb_state & SBS_CANTRCVMORE))
++#endif
+ __nthread_wakeup(info);
+
+ return (SU_OK);