From c3c3be6457a8cdb2f24068486becd2ecf49d0b6e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 30 Aug 2020 14:08:39 -0700 Subject: [PATCH] bmx6: fix compilation with uClibc-ng Signed-off-by: Rosen Penev --- bmx6/Makefile | 2 +- bmx6/patches/010-siocgstamp.patch | 40 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 bmx6/patches/010-siocgstamp.patch diff --git a/bmx6/Makefile b/bmx6/Makefile index 027098d..2b0dd4c 100644 --- a/bmx6/Makefile +++ b/bmx6/Makefile @@ -33,7 +33,7 @@ PKG_SOURCE_URL:=https://github.com/bmx-routing/bmx6.git PKG_REV:=d8869ec69797be0ca2da06abb344e60198a8a275 PKG_MIRROR_HASH:=4aae08158666f5976c952e195b3a1369a5f7bba26fedd5d5ea33b35956e24ec6 PKG_VERSION:=r2018051214 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 PKG_SOURCE_VERSION:=$(PKG_REV) diff --git a/bmx6/patches/010-siocgstamp.patch b/bmx6/patches/010-siocgstamp.patch new file mode 100644 index 0000000..10c2582 --- /dev/null +++ b/bmx6/patches/010-siocgstamp.patch @@ -0,0 +1,40 @@ +--- a/schedule.c ++++ b/schedule.c +@@ -356,7 +356,9 @@ loop4Event: + continue; + } + ++#ifdef SIOCGSTAMP + ioctl(pb.i.iif->rx_mcast_sock, SIOCGSTAMP, &(pb.i.tv_stamp)) ; ++#endif + + rx_packet( &pb ); + +@@ -381,8 +383,10 @@ loop4Event: + + continue; + } +- ++ ++#ifdef SIOCGSTAMP + ioctl(pb.i.iif->rx_fullbrc_sock, SIOCGSTAMP, &(pb.i.tv_stamp)) ; ++#endif + + rx_packet( &pb ); + +@@ -432,10 +436,15 @@ loop4Event: + } + } + #endif ++#ifdef SIOCGSTAMP + if ( tv_stamp == NULL ) + ioctl( pb.i.iif->unicast_sock, SIOCGSTAMP, &(pb.i.tv_stamp) ); + else + timercpy( tv_stamp, &(pb.i.tv_stamp) ); ++#else ++ if (tv_stamp) ++ timercpy( tv_stamp, &(pb.i.tv_stamp) ); ++#endif + + rx_packet( &pb ); +