Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Several cases of overlapping changes which were for the most part trivially resolvable. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -4051,7 +4051,7 @@ static int __init init_mac80211_hwsim(void)
|
||||
err = dev_alloc_name(hwsim_mon, hwsim_mon->name);
|
||||
if (err < 0) {
|
||||
rtnl_unlock();
|
||||
goto out_free_radios;
|
||||
goto out_free_mon;
|
||||
}
|
||||
|
||||
err = register_netdevice(hwsim_mon);
|
||||
|
Reference in New Issue
Block a user