Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[cascardo/linux.git] / Documentation / networking / ifenslave.c

diff --git a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c
index a120598..1b96ccd 100644 (file)
--- a/Documentation/networking/ifenslave.c
+++ b/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]);