diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2013-11-18 12:18:05 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2013-11-18 12:18:05 +0000 |
| commit | ebf3173f30e7e9c24d34ebc9831fddcdb8c743db (patch) | |
| tree | 65bafcbdf4aa4587d3c0e17768a8b66073463d7c /misc/dahdi-kmod26 | |
| parent | 0756362fee144064cc6eada280b2df750c505435 (diff) | |
| download | ports-ebf3173f30e7e9c24d34ebc9831fddcdb8c743db.tar.gz ports-ebf3173f30e7e9c24d34ebc9831fddcdb8c743db.zip | |
Unbreak on FreeBSD 10 and clang.
Notes
Notes:
svn path=/head/; revision=334177
Diffstat (limited to 'misc/dahdi-kmod26')
| -rw-r--r-- | misc/dahdi-kmod26/files/patch-drivers-dahdi-dahdi-base.c | 11 | ||||
| -rw-r--r-- | misc/dahdi-kmod26/files/patch-drivers-dahdi-wctc4xxp-base.c | 31 |
2 files changed, 42 insertions, 0 deletions
diff --git a/misc/dahdi-kmod26/files/patch-drivers-dahdi-dahdi-base.c b/misc/dahdi-kmod26/files/patch-drivers-dahdi-dahdi-base.c new file mode 100644 index 000000000000..cc2fa9b5adf4 --- /dev/null +++ b/misc/dahdi-kmod26/files/patch-drivers-dahdi-dahdi-base.c @@ -0,0 +1,11 @@ +--- drivers/dahdi/dahdi-base.c.orig 2013-11-18 19:11:51.000000000 +0700 ++++ drivers/dahdi/dahdi-base.c 2013-11-18 19:12:07.000000000 +0700 +@@ -10224,6 +10224,8 @@ + .d_poll = dahdi_device_poll, + .d_name = "dahdi", + #if __FreeBSD_version >= 800039 ++ .d_flags = D_TRACKCLOSE | D_NEEDMINOR ++#elif __FreeBSD_version >= 800039 + .d_flags = D_PSEUDO | D_TRACKCLOSE | D_NEEDMINOR + #else + .d_flags = D_PSEUDO | D_TRACKCLOSE diff --git a/misc/dahdi-kmod26/files/patch-drivers-dahdi-wctc4xxp-base.c b/misc/dahdi-kmod26/files/patch-drivers-dahdi-wctc4xxp-base.c new file mode 100644 index 000000000000..108399018849 --- /dev/null +++ b/misc/dahdi-kmod26/files/patch-drivers-dahdi-wctc4xxp-base.c @@ -0,0 +1,31 @@ +--- drivers/dahdi/wctc4xxp/base.c.orig 2013-11-18 19:15:33.000000000 +0700 ++++ drivers/dahdi/wctc4xxp/base.c 2013-11-18 19:15:48.000000000 +0700 +@@ -2423,8 +2423,8 @@ + + if (unlikely(count > SFRAME_SIZE - sizeof(struct rtp_packet))) { + DTE_DEBUG(DTE_DEBUG_GENERAL, +- "Cannot transcode packet of %Zu bytes. This exceeds the " \ +- "maximum size of %Zu bytes.\n", count, ++ "Cannot transcode packet of %zu bytes. This exceeds the " \ ++ "maximum size of %zu bytes.\n", count, + SFRAME_SIZE - sizeof(struct rtp_packet)); + return -EINVAL; + } +@@ -2434,7 +2434,7 @@ + (G723_SID_BYTES != count)) { + DTE_DEBUG(DTE_DEBUG_GENERAL, + "Trying to transcode packet into G723 format " \ +- "that is %Zu bytes instead of the expected " \ ++ "that is %zu bytes instead of the expected " \ + "%d/%d/%d bytes.\n", count, G723_5K_BYTES, + G723_6K_BYTES, G723_SID_BYTES); + return -EINVAL; +@@ -2465,7 +2465,7 @@ + cpvt->seqno += 1; + + DTE_DEBUG(DTE_DEBUG_RTP_TX, +- "Sending packet of %Zu byte on channel (%p).\n", count, dtc); ++ "Sending packet of %zu byte on channel (%p).\n", count, dtc); + + atomic_inc(&cpvt->stats.packets_sent); + wctc4xxp_transmit_cmd(wc, cmd); |