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/bluetooth | |
| parent | f7aec129a356ad049edddcb7e77b04a474fcf41f (diff) | |
| parent | a090bd4ff8387c409732a8e059fbf264ea0bdd56 (diff) | |
| download | linux-rpi-0ddead90b223faae475f3296a50bf574b7f7c69a.tar.gz linux-rpi-0ddead90b223faae475f3296a50bf574b7f7c69a.tar.bz2 linux-rpi-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/bluetooth')
| -rw-r--r-- | net/bluetooth/6lowpan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c index 608959989f8e..ab3b654b05cc 100644 --- a/net/bluetooth/6lowpan.c +++ b/net/bluetooth/6lowpan.c @@ -598,7 +598,7 @@ static void netdev_setup(struct net_device *dev) dev->netdev_ops = &netdev_ops; dev->header_ops = &header_ops; - dev->destructor = free_netdev; + dev->needs_free_netdev = true; } static struct device_type bt_type = { |