diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/luci-lib-ip/src/ip.c | 6 | ||||
| -rw-r--r-- | libs/luci-lib-nixio/src/Makefile | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libs/luci-lib-ip/src/ip.c b/libs/luci-lib-ip/src/ip.c index 10d11a365b..9b157da265 100644 --- a/libs/luci-lib-ip/src/ip.c +++ b/libs/luci-lib-ip/src/ip.c @@ -837,6 +837,12 @@ static int cidr_tolinklocal(lua_State *L) p2->bits = AF_BITS(AF_INET6); p2->addr.u8[0] = 0xFE; p2->addr.u8[1] = 0x80; + p2->addr.u8[2] = 0x00; + p2->addr.u8[3] = 0x00; + p2->addr.u8[4] = 0x00; + p2->addr.u8[5] = 0x00; + p2->addr.u8[6] = 0x00; + p2->addr.u8[7] = 0x00; p2->addr.u8[8] = p1->addr.u8[0] ^ 0x02; p2->addr.u8[9] = p1->addr.u8[1]; p2->addr.u8[10] = p1->addr.u8[2]; diff --git a/libs/luci-lib-nixio/src/Makefile b/libs/luci-lib-nixio/src/Makefile index a7e9a77d99..893656c256 100644 --- a/libs/luci-lib-nixio/src/Makefile +++ b/libs/luci-lib-nixio/src/Makefile @@ -51,7 +51,7 @@ ifeq ($(OS),SunOS) endif ifneq (,$(findstring MINGW,$(OS))$(findstring mingw,$(OS))$(findstring Windows,$(OS))) - NIXIO_CROSS_CC:=$(shell which i586-mingw32msvc-cc) + NIXIO_CROSS_CC:=$(shell command -v i586-mingw32msvc-cc) ifneq (,$(NIXIO_CROSS_CC)) CC:=$(NIXIO_CROSS_CC) endif |