diff --git a/[refs] b/[refs] index f2b4f1d27a4e..7726d49a1d68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebc8d2ab61dde6cf775ae7bb1ed9e38dfe12ca65 +refs/heads/master: 0c27922e4933ceb86644f4a9b1af212ffe5aad75 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 4913089c91dc..81b392ef5114 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -3655,8 +3655,8 @@ static int dev_addr_init(struct net_device *dev) /* rtnl_mutex must be held here */ INIT_LIST_HEAD(&dev->dev_addr_list); - memset(addr, 0, sizeof(*addr)); - err = __hw_addr_add(&dev->dev_addr_list, NULL, addr, sizeof(*addr), + memset(addr, 0, sizeof(addr)); + err = __hw_addr_add(&dev->dev_addr_list, NULL, addr, sizeof(addr), NETDEV_HW_ADDR_T_LAN); if (!err) { /*