diff options
| author | Wojciech Dubowik <klute99@gmail.com> | 2018-04-09 14:02:00 +0200 |
|---|---|---|
| committer | Wojciech Dubowik <Wojciech.Dubowik@neratec.com> | 2018-04-09 15:01:15 +0200 |
| commit | 2c016412168ac03e41c41c774c55e84c63550100 (patch) | |
| tree | 7cf9b75157ea0da312e08d180f9bcce2e40d62ac /net | |
| parent | 4750b7261e9639d2764c2e6c46a8c9eb09e3edc6 (diff) | |
Bump linuxptp to version 1.9.2
Signed-off-by: Wojciech Dubowik <klute99@gmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/linuxptp/Makefile | 4 | ||||
| -rw-r--r-- | net/linuxptp/patches/030-upstream.patch | 37 |
2 files changed, 2 insertions, 39 deletions
diff --git a/net/linuxptp/Makefile b/net/linuxptp/Makefile index df916d1c8..85b664646 100644 --- a/net/linuxptp/Makefile +++ b/net/linuxptp/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linuxptp -PKG_VERSION:=1.9 +PKG_VERSION:=1.9.2 PKG_RELEASE:=1 PKG_MAINTAINER:=Wojciech Dubowik <Wojciech.Dubowik@neratec.com> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=@SF/$(PKG_NAME)/v$(PKG_VERSION) -PKG_HASH:=5fb1e4889ccb06f887fc2972fc8b89d17a4cb6355406854f916ebc8d7f51580e +PKG_HASH:=7f662e65c66c37ff211dc525476626875c2b74162ded05c8a25d036fb963b8d0 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/net/linuxptp/patches/030-upstream.patch b/net/linuxptp/patches/030-upstream.patch deleted file mode 100644 index bdb8fb7e2..000000000 --- a/net/linuxptp/patches/030-upstream.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d14f11fd329a7da94c0d0190a169f743eb91031b Mon Sep 17 00:00:00 2001 -From: Richard Cochran <richardcochran@gmail.com> -Date: Mon, 2 Apr 2018 20:19:51 -0700 -Subject: [PATCH] msg: Append multiple TLVs correctly. - -The logic that adds TLVs to the end of a message mixes up the 'L' -length in "TLV" with the total TLV length. As a result, the second -and subsequent TLVs will corrupt the previous TLV in the buffer. This -patch corrects the code to find the correct offset for the second and -following appended TLVs. - -Note that the stack does not currently trigger this latent bug because -only single TLVs are appended. - -Fixes: 4a8877f90462 ("msg: Introduce method for appending multiple TLVs on transmit.") - -Signed-off-by: Richard Cochran <richardcochran@gmail.com> ---- - msg.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/msg.c b/msg.c -index b7e1053..c004568 100644 ---- a/msg.c -+++ b/msg.c -@@ -151,6 +151,8 @@ static struct tlv_extra *msg_tlv_prepare(struct ptp_message *msg, int length) - tmp = TAILQ_LAST(&msg->tlv_list, tlv_list); - if (tmp) { - ptr = (uint8_t *) tmp->tlv; -+ ptr += sizeof(tmp->tlv->type); -+ ptr += sizeof(tmp->tlv->length); - ptr += tmp->tlv->length; - } - --- -2.7.4 - |