From: Paul Mackerras <paulus@samba.org>
Date: Thu, 9 Jun 1994 02:19:37 +0000 (+0000)
Subject: patch for proxy arp stuff
X-Git-Tag: ppp-2-1-2a~2
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=0e712663a22b7a04dc60803fbf8e8a0944b330bf;hp=a9d065092a03114114a99454393499ff21a8b6b7

patch for proxy arp stuff
---

diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
index 7083233..306ae4a 100644
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@ -775,16 +775,20 @@ int get_ether_addr (u_long ipaddr, struct sockaddr *hwaddr)
     }
 
     hwaddr->sa_family = ARPHRD_ETHER;
+#ifndef old_ifr_hwaddr
     memcpy (&hwaddr->sa_data, &ifreq.ifr_hwaddr, ETH_ALEN);
+#else
+    memcpy (&hwaddr->sa_data, &ifreq.ifr_hwaddr.sa_data, ETH_ALEN);
+#endif
 
     MAINDEBUG ((LOG_DEBUG,
 		"proxy arp: found hwaddr %02x:%02x:%02x:%02x:%02x:%02x",
-		(int) ((unsigned char *) &ifreq.ifr_hwaddr)[0],
-		(int) ((unsigned char *) &ifreq.ifr_hwaddr)[1],
-		(int) ((unsigned char *) &ifreq.ifr_hwaddr)[2],
-		(int) ((unsigned char *) &ifreq.ifr_hwaddr)[3],
-		(int) ((unsigned char *) &ifreq.ifr_hwaddr)[4],
-		(int) ((unsigned char *) &ifreq.ifr_hwaddr)[5]));
+		(int) ((unsigned char *) &hwaddr->sa_data)[0],
+		(int) ((unsigned char *) &hwaddr->sa_data)[1],
+		(int) ((unsigned char *) &hwaddr->sa_data)[2],
+		(int) ((unsigned char *) &hwaddr->sa_data)[3],
+		(int) ((unsigned char *) &hwaddr->sa_data)[4],
+		(int) ((unsigned char *) &hwaddr->sa_data)[5]));
     return 1;
 }