diff options
Diffstat (limited to 'net/isboot-kmod')
| -rw-r--r-- | net/isboot-kmod/Makefile | 2 | ||||
| -rw-r--r-- | net/isboot-kmod/distinfo | 4 | ||||
| -rw-r--r-- | net/isboot-kmod/files/patch-iscsi.c | 56 |
3 files changed, 3 insertions, 59 deletions
diff --git a/net/isboot-kmod/Makefile b/net/isboot-kmod/Makefile index f4f0d4c0bedc..245826e48cfb 100644 --- a/net/isboot-kmod/Makefile +++ b/net/isboot-kmod/Makefile @@ -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} diff --git a/net/isboot-kmod/distinfo b/net/isboot-kmod/distinfo index 30ec3443d480..d631fde967d9 100644 --- a/net/isboot-kmod/distinfo +++ b/net/isboot-kmod/distinfo @@ -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 diff --git a/net/isboot-kmod/files/patch-iscsi.c b/net/isboot-kmod/files/patch-iscsi.c deleted file mode 100644 index 8634a7414894..000000000000 --- a/net/isboot-kmod/files/patch-iscsi.c +++ /dev/null @@ -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)), |