mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-07 06:40:06 +00:00
Code Issues Releases Activity

net/isboot-kmod: 0.2.10 -> 0.2.11

Browse Source 
- patches upstreamed
- added header values to be more independent from base iSCSI
- limited builtin initiator to handle login sequence

PR:		203324
Submitted by:	Daisuke Aoyama <aoyama@peach.ne.jp> (upstream)
Approved by:	John Nielsen <john@jnielsen.net> (maintainer)
This commit is contained in:
Kurt Jaeger 2015-09-25 17:50:04 +00:00
parent 4993e91ad0
commit 79be6f7722
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=397845
3 changed files with 3 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/isboot-kmod/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= isboot-kmod
PORTVERSION= 0.2.10
PORTVERSION= 0.2.11
CATEGORIES= net
MASTER_SITES= http://www.peach.ne.jp/archives/isboot/
DISTNAME= isboot-${PORTVERSION}

4
net/isboot-kmod/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (isboot-0.2.10.tar.gz) = b801708256f789e1032f7be2db79f886919fddb7b9b26ec1835f68a8237c3b48
SIZE (isboot-0.2.10.tar.gz) = 30268
SHA256 (isboot-0.2.11.tar.gz) = c09ade1e119447650c72d4a3387a934f0be7b6f5fb2c9aa5320e284fb2d1ec47
SIZE (isboot-0.2.11.tar.gz) = 31084

56
net/isboot-kmod/files/patch-iscsi.c
View File

@ -1,56 +0,0 @@
--- iscsi.c.orig 2015-09-23 05:51:43 UTC
+++ iscsi.c
@@ -1036,24 +1036,30 @@ isboot_append_param(pdu_t *pp, char *for
return (n);
}
-#if __FreeBSD_version >= 1000050
+#if __FreeBSD_version < 1000050
+static void
+isboot_free_mbufext(void *p, void *optarg)
+#endif
+#if __FreeBSD_version >= 1000050 && __FreeBSD_version < 1100000
+#define EXT_FREE_OK 0
static int
isboot_free_mbufext(struct mbuf *m, void *p, void *optarg)
-#else
+#endif
+#if __FreeBSD_version >= 1100000
static void
-isboot_free_mbufext(void *p, void *optarg)
+isboot_free_mbufext(struct mbuf *m, void *p, void *optarg)
#endif
{
ISBOOT_TRACE("isboot_free_mbufext\n");
if (p == NULL)
-#if __FreeBSD_version >= 1000050
+#if __FreeBSD_version >= 1000050 && __FreeBSD_version < 1100000
return (EXT_FREE_OK);
#else
return;
#endif
isboot_free_mext(p);
-#if __FreeBSD_version >= 1000050
+#if __FreeBSD_version >= 1000050 && __FreeBSD_version < 1100000
return (EXT_FREE_OK);
#endif
}
@@ -1072,7 +1078,7 @@ isboot_xmit_pdu(struct isboot_sess *sess
+ sizeof(pp->hdr_dig) > MHLEN) {
panic("AHS=%d is too large", pp->ahs_len);
}
- MGETHDR(mh, M_TRYWAIT, MT_DATA);
+ MGETHDR(mh, M_WAITOK, MT_DATA);
mh->m_pkthdr.rcvif = NULL;
memcpy(mh->m_data, &pp->ipdu, ISCSI_BHS_LEN);
mh->m_len = ISCSI_BHS_LEN;
@@ -1099,7 +1105,7 @@ isboot_xmit_pdu(struct isboot_sess *sess
/* allocate external buffer and add it to mbuf */
ds_dd = isboot_malloc_mext(ISCSI_ALIGN(pp->ds_len)
+ sizeof(pp->ds_dig));
- MGET(md, M_TRYWAIT, MT_DATA);
+ MGET(md, M_WAITOK, MT_DATA);
#if __FreeBSD_version >= 800016
MEXTADD(md, (caddr_t)ds_dd, (ISCSI_ALIGN(pp->ds_len)
+ sizeof(pp->ds_dig)),