Merge pull request #4301 from billsq/ifname_addr_fix