diff --git a/[refs] b/[refs] index 9512d345d0fb..cad6ad5f4a5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d82c53a380ca96421a714481c9113ba54ede609 +refs/heads/master: 2fcf282471f04f465d0368e46e973e01504292b3 diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c index 236d15841812..cd5fb40d3fd4 100644 --- a/trunk/net/mac80211/iface.c +++ b/trunk/net/mac80211/iface.c @@ -363,8 +363,7 @@ static int ieee80211_open(struct net_device *dev) int err; /* fail early if user set an invalid address */ - if (!is_zero_ether_addr(dev->dev_addr) && - !is_valid_ether_addr(dev->dev_addr)) + if (!is_valid_ether_addr(dev->dev_addr)) return -EADDRNOTAVAIL; err = ieee80211_check_concurrent_iface(sdata, sdata->vif.type);