diff options
| author |  David S. Miller <davem@davemloft.net>
| 2008-12-02 19:50:27 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2008-12-02 19:50:27 -0800 |
| commit | aa2ba5f1082dc705745899584aac8416d710c056 (patch) | |
| tree | bde0bf4aff036c6bac19a0212194ae1092afb3c9 /net/phonet | |
| parent | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rus... (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| download | linux-aa2ba5f1082dc705745899584aac8416d710c056.tar.gz linux-aa2ba5f1082dc705745899584aac8416d710c056.tar.bz2 linux-aa2ba5f1082dc705745899584aac8416d710c056.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
Diffstat (limited to 'net/phonet')
| -rw-r--r-- | net/phonet/pn_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c index 53be9fc82aaa..f93ff8ef47d0 100644 --- a/net/phonet/pn_dev.c +++ b/net/phonet/pn_dev.c @@ -115,7 +115,7 @@ int phonet_address_del(struct net_device *dev, u8 addr) pnd = __phonet_get(dev); if (!pnd || !test_and_clear_bit(addr >> 2, pnd->addrs)) err = -EADDRNOTAVAIL; - if (bitmap_empty(pnd->addrs, 64)) + else if (bitmap_empty(pnd->addrs, 64)) __phonet_device_free(pnd); spin_unlock_bh(&pndevs.lock); return err; |