From 1f933b235e5b9d881cf75854b8da91f39f30046c Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 12 Aug 2008 15:09:08 -0700
Subject: [PATCH] --- yaml --- r: 108271 b: refs/heads/master c:
 b3784a77f6f30a8ef5e37f3c7165930b1b66470b h: refs/heads/master i:   108269:
 f9a0c10dab0a9eca79ce96a97a4c8602daee46c1   108267:
 c6501f8afb9677ea7902cb42ad9e53755ddad495   108263:
 e90381417c101b1619c16423b65248194f80a544   108255:
 c70bb1db4461fcaab2cf35ad42d77223eaf04393 v: v3

---
 [refs]                                     | 2 +-
 trunk/Documentation/networking/ifenslave.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 96f19a7b04cf..7a4d16e25cd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d39d9440dd6e590f78c295c5fdef195956da1c1
+refs/heads/master: b3784a77f6f30a8ef5e37f3c7165930b1b66470b
diff --git a/trunk/Documentation/networking/ifenslave.c b/trunk/Documentation/networking/ifenslave.c
index a12059886755..1b96ccda3836 100644
--- a/trunk/Documentation/networking/ifenslave.c
+++ b/trunk/Documentation/networking/ifenslave.c
@@ -1081,7 +1081,7 @@ static int set_if_addr(char *master_ifname, char *slave_ifname)
 
 		}
 
-		ipaddr = ifr.ifr_addr.sa_data;
+		ipaddr = (unsigned char *)ifr.ifr_addr.sa_data;
 		v_print("Interface '%s': set IP %s to %d.%d.%d.%d\n",
 			slave_ifname, ifra[i].desc,
 			ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);