Merge commit 'df22b314' into thread-merge-2.16

diff --cc sysdep/unix/io.c
index f5155cd6566011b6a2420db852794b75c0a4dc22,987c7a6ba942ea5484a1b120d83f86ce6850cdfd..f02a554d7a3b5ffcf58c2008fe0c333fa891edbc
--- 1/sysdep/unix/io.c
--- 2/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@@ -1108,10 -971,11 +1108,11 @@@ sk_setup(sock *s
    }
  #endif
  
-   if (s->vrf && (s->vrf != &default_vrf) && !s->iface)
 -  if (s->vrf && !s->iface && (s->type != SK_TCP))
++  if (s->vrf && (s->vrf != &default_vrf) && !s->iface && (s->type != SK_TCP))
    {
      /* Bind socket to associated VRF interface.
-        This is Linux-specific, but so is SO_BINDTODEVICE. */
+        This is Linux-specific, but so is SO_BINDTODEVICE.
+        For accepted TCP sockets it is inherited from the listening one. */
  #ifdef SO_BINDTODEVICE
      struct ifreq ifr = {};
      strcpy(ifr.ifr_name, s->vrf->name);