summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <paul>2005-11-11 09:52:40 +0000
committerpaul <paul>2005-11-11 09:52:40 +0000
commit0994c3a59c114e4e2427f2c02cb2f12881854e36 (patch)
tree8f2230655273a995a554ffa51e2daad325c08df3
parentca6383ba74cca26d8e33184a1c2abc69a1149ef9 (diff)
[zebra] Fix warning and small connected-label changes merge error.
2005-11-11 Paul Jakma <paul.jakma@sun.com> * kernel_socket.c: (ifm_read) arithmetic on void pointer warning. (ifam_read) Fix error from connected-with-label merge, something crept in from the pending Solaris kernel_socket.c patch which shouldn't have.
-rw-r--r--zebra/ChangeLog8
-rw-r--r--zebra/kernel_socket.c8
2 files changed, 11 insertions, 5 deletions
diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index e1723603..dfd1df4c 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-11 Paul Jakma <paul.jakma@sun.com>
+
+ * kernel_socket.c: (ifm_read) arithmetic on void pointer
+ warning.
+ (ifam_read) Fix error from connected-with-label merge,
+ something crept in from the pending Solaris kernel_socket.c
+ patch which shouldn't have.
+
2005-11-03 Paul Jakma <paul.jakma@sun.com>
* connected.{c,h}: Include memory.h
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index c264437d..b1b143ee 100644
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -250,7 +250,7 @@ ifm_read (struct if_msghdr *ifm)
{
struct interface *ifp = NULL;
struct sockaddr_dl *sdl = NULL;
- void *cp;
+ caddr_t *cp;
unsigned int i;
/* paranoia: sanity check structure */
@@ -488,8 +488,7 @@ ifam_read (struct ifa_msghdr *ifam)
if (ifam->ifam_type == RTM_NEWADDR)
connected_add_ipv4 (ifp, 0, &addr.sin.sin_addr,
ip_masklen (mask.sin.sin_addr),
- &brd.sin.sin_addr,
- (isalias ? ifname : NULL) );
+ &brd.sin.sin_addr, NULL);
else
connected_delete_ipv4 (ifp, 0, &addr.sin.sin_addr,
ip_masklen (mask.sin.sin_addr),
@@ -506,8 +505,7 @@ ifam_read (struct ifa_msghdr *ifam)
connected_add_ipv6 (ifp,
&addr.sin6.sin6_addr,
ip6_masklen (mask.sin6.sin6_addr),
- &brd.sin6.sin6_addr,
- (isalias ? ifname : NULL) );
+ &brd.sin6.sin6_addr, NULL);
else
connected_delete_ipv6 (ifp,
&addr.sin6.sin6_addr,