projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[firefly-linux-kernel-4.4.55.git]
/
net
/
mac80211
/
iface.c
diff --git
a/net/mac80211/iface.c
b/net/mac80211/iface.c
index dee30aea9ab31eba7021812894c35d495e28ab71..cd5fb40d3fd4bbb7579d21e8a37a1e27a1e1ffe4 100644
(file)
--- a/
net/mac80211/iface.c
+++ b/
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 */
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);
return -EADDRNOTAVAIL;
err = ieee80211_check_concurrent_iface(sdata, sdata->vif.type);
@@
-1130,8
+1129,8
@@
int ieee80211_if_add(struct ieee80211_local *local, const char *name,
ASSERT_RTNL();
ASSERT_RTNL();
- ndev = alloc_netdev_mq(sizeof(*sdata) + local->hw.vif_data_size,
-
name, ieee80211_if_setup, local->hw.queues
);
+ ndev = alloc_netdev_mq
s
(sizeof(*sdata) + local->hw.vif_data_size,
+
name, ieee80211_if_setup, local->hw.queues, 1
);
if (!ndev)
return -ENOMEM;
dev_net_set(ndev, wiphy_net(local->hw.wiphy));
if (!ndev)
return -ENOMEM;
dev_net_set(ndev, wiphy_net(local->hw.wiphy));