diff options
| author | David S. Miller | 2014-06-12 01:02:55 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-06-12 01:02:55 +0200 |
| commit | 902455e00720018d1dbd38327c3fd5bda6d844ee (patch) | |
| tree | 02fc906c5bc318220ad4827c6eac2521b9d1fbbf /net/mac80211/iface.c | |
| parent | net/fsl: xgmac_mdio is dependent on OF_MDIO (diff) | |
| parent | net/core: Add VF link state control policy (diff) | |
| download | kernel-qcow2-linux-902455e00720018d1dbd38327c3fd5bda6d844ee.tar.gz kernel-qcow2-linux-902455e00720018d1dbd38327c3fd5bda6d844ee.tar.xz kernel-qcow2-linux-902455e00720018d1dbd38327c3fd5bda6d844ee.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/core/rtnetlink.c
net/core/skbuff.c
Both conflicts were very simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 81a8e2a0b6aa..388b863e821c 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1780,7 +1780,6 @@ void ieee80211_remove_interfaces(struct ieee80211_local *local) } mutex_unlock(&local->iflist_mtx); unregister_netdevice_many(&unreg_list); - list_del(&unreg_list); list_for_each_entry_safe(sdata, tmp, &wdev_list, list) { list_del(&sdata->list); |