diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-15 11:31:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-15 11:59:32 -0400 |
| commit | 0ddead90b223faae475f3296a50bf574b7f7c69a (patch) | |
| tree | e729c7fcdc7e3697f7fae2f3028ed0d11931c425 /net/openvswitch | |
| parent | f7aec129a356ad049edddcb7e77b04a474fcf41f (diff) | |
| parent | a090bd4ff8387c409732a8e059fbf264ea0bdd56 (diff) | |
| download | linux-stable-0ddead90b223faae475f3296a50bf574b7f7c69a.tar.gz linux-stable-0ddead90b223faae475f3296a50bf574b7f7c69a.tar.bz2 linux-stable-0ddead90b223faae475f3296a50bf574b7f7c69a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/vport-internal_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c index 89193a634da4..04a3128adcf0 100644 --- a/net/openvswitch/vport-internal_dev.c +++ b/net/openvswitch/vport-internal_dev.c @@ -94,7 +94,6 @@ static void internal_dev_destructor(struct net_device *dev) struct vport *vport = ovs_internal_dev_get_vport(dev); ovs_vport_free(vport); - free_netdev(dev); } static void @@ -156,7 +155,8 @@ static void do_setup(struct net_device *netdev) netdev->priv_flags &= ~IFF_TX_SKB_SHARING; netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_OPENVSWITCH | IFF_PHONY_HEADROOM | IFF_NO_QUEUE; - netdev->destructor = internal_dev_destructor; + netdev->needs_free_netdev = true; + netdev->priv_destructor = internal_dev_destructor; netdev->ethtool_ops = &internal_dev_ethtool_ops; netdev->rtnl_link_ops = &internal_dev_link_ops; |