mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 05:06:43 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
This commit is contained in:
commit
56f69a0a78
@ -8327,7 +8327,7 @@ index b26495a..a06b534 100644
|
|||||||
obj-y += carma/
|
obj-y += carma/
|
||||||
obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
|
obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
|
||||||
obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/
|
obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/
|
||||||
+obj-y += vc04_services/
|
+obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/
|
||||||
diff --git a/drivers/misc/vc04_services/Kconfig b/drivers/misc/vc04_services/Kconfig
|
diff --git a/drivers/misc/vc04_services/Kconfig b/drivers/misc/vc04_services/Kconfig
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..b48a3f3
|
index 0000000..b48a3f3
|
||||||
|
@ -0,0 +1,10 @@
|
|||||||
|
--- a/src/socketlib.c 2012-07-14 22:49:30.000000000 +0200
|
||||||
|
+++ b/src/socketlib.c 2012-10-08 21:55:51.000000000 +0200
|
||||||
|
@@ -118,6 +118,7 @@
|
||||||
|
|
||||||
|
int tEnable = 1;
|
||||||
|
setsockopt(tSock, SOL_SOCKET, SO_REUSEADDR, &tEnable, sizeof (tEnable));
|
||||||
|
+ server_addr->ai_addr->sa_family = server_addr->ai_family; // ensure that server_addr has same famliy than the socket
|
||||||
|
if (bind(tSock, server_addr->ai_addr, server_addr->ai_addrlen) < 0)
|
||||||
|
{
|
||||||
|
close(tSock);
|
Loading…
x
Reference in New Issue
Block a user