diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-13 13:56:44 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-13 13:56:44 +0200 |
commit | 73909f7a665991013dcff42a815fda76d3a7300a (patch) | |
tree | 84bb9899e2204bf6af6fd4f249bb909c2a89faf8 /Documentation/networking/ifenslave.c | |
parent | lockdep: build fix (diff) | |
parent | Linux 2.6.27-rc3 (diff) | |
download | linux-73909f7a665991013dcff42a815fda76d3a7300a.tar.xz linux-73909f7a665991013dcff42a815fda76d3a7300a.zip |
Merge commit 'v2.6.27-rc3' into core/urgent
Diffstat (limited to 'Documentation/networking/ifenslave.c')
-rw-r--r-- | Documentation/networking/ifenslave.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c index a12059886755..1b96ccda3836 100644 --- 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]); |