diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-06-11 16:02:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-11 16:02:55 -0700 |
| commit | 902455e00720018d1dbd38327c3fd5bda6d844ee (patch) | |
| tree | 02fc906c5bc318220ad4827c6eac2521b9d1fbbf /drivers/net/macvlan.c | |
| parent | net/fsl: xgmac_mdio is dependent on OF_MDIO (diff) | |
| parent | net/core: Add VF link state control policy (diff) | |
| download | linux-dev-902455e00720018d1dbd38327c3fd5bda6d844ee.tar.xz linux-dev-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 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 453d55a02492..958df383068a 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -1204,7 +1204,6 @@ static int macvlan_device_event(struct notifier_block *unused, list_for_each_entry_safe(vlan, next, &port->vlans, list) vlan->dev->rtnl_link_ops->dellink(vlan->dev, &list_kill); unregister_netdevice_many(&list_kill); - list_del(&list_kill); break; case NETDEV_PRE_TYPE_CHANGE: /* Forbid underlaying device to change its type. */ |