Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/erlang/patches/inet_drv.c.patch
author April Chin <april.chin@oracle.com>
Fri, 08 Jul 2011 13:30:02 -0700
changeset 382 5d2ca734dd20
parent 346 d28be18217b8
permissions -rw-r--r--
7058584 Move memcached-java from SFW to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
346
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     1
 
--- otp_src_R12B-5/erts/emulator/drivers/common/inet_drv.c	Tue Nov  4 11:51:25 2008
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     2
 
+++ otp_src_R12B-5-patch/erts/emulator/drivers/common/inet_drv.c	Mon Jun 20 11:02:49 2011
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     3
 
@@ -4128,6 +4128,7 @@
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     4
 
 	    break;
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     5
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     6
 
 	case INET_IFOPT_HWADDR: {
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     7
 
+#ifdef IFHWADDRLEN
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     8
 
 #ifdef SIOCGIFHWADDR
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     9
 
 	    if (ioctl(desc->s, SIOCGIFHWADDR, (char *)&ifreq) < 0)
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    10
 
 		break;
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    11
 
@@ -4137,6 +4138,7 @@
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    12
 
 	    sys_memcpy(sptr, (char*)(&ifreq.ifr_hwaddr.sa_data), IFHWADDRLEN);
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    13
 
 	    sptr += IFHWADDRLEN;
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    14
 
 #endif
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    15
 
+#endif
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    16
 
 	    break;
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    17
 
 	}
d28be18217b8 7056876 move erlang to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    18
upstream/oracle/userland-gate