projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
net
/
tipc
/
eth_media.c
diff --git
a/net/tipc/eth_media.c
b/net/tipc/eth_media.c
index f72ba774c246835228405e712a64c1387c6123e3..524ba5696d4d6530c1cf7cea80832cb8158cfaa9 100644
(file)
--- a/
net/tipc/eth_media.c
+++ b/
net/tipc/eth_media.c
@@
-167,7
+167,7
@@
static int enable_bearer(struct tipc_bearer *tb_ptr)
tb_ptr->mtu = dev->mtu;
tb_ptr->blocked = 0;
tb_ptr->addr.type = htonl(TIPC_MEDIA_TYPE_ETH);
- memcpy(&tb_ptr->addr.dev_addr,
&
dev->dev_addr, ETH_ALEN);
+ memcpy(&tb_ptr->addr.dev_addr, dev->dev_addr, ETH_ALEN);
return 0;
}