X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=306ae4a8bca14468b89c64dc61a689e15545f1e6;hp=daaf612eccb69c4bfde9a029706ed5da0762b2ed;hb=a115760c2c03a34dd5aa1ed7274ac49810d7dd45;hpb=d3cb9cc0a5eda3ff79526e3c0efb5e669ebaa80b

diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
index daaf612..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;
-    memcpy (&hwaddr->sa_data, &ifr->ifr_hwaddr, ETH_ALEN);
+#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 *) &ifr->ifr_hwaddr)[0],
-		(int) ((unsigned char *) &ifr->ifr_hwaddr)[1],
-		(int) ((unsigned char *) &ifr->ifr_hwaddr)[2],
-		(int) ((unsigned char *) &ifr->ifr_hwaddr)[3],
-		(int) ((unsigned char *) &ifr->ifr_hwaddr)[4],
-		(int) ((unsigned char *) &ifr->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;
 }