projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916...
[firefly-linux-kernel-4.4.55.git]
/
Documentation
/
networking
/
ifenslave.c
diff --git
a/Documentation/networking/ifenslave.c
b/Documentation/networking/ifenslave.c
index a12059886755c7d2b5ff346eaaf495f9376a589a..1b96ccda3836507b18e14a60744b7bfa16de1c83 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]);