diff options
| author | David Chau <ddcc@mit.edu> | 2005-07-06 00:11:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-06 00:11:06 +0200 |
| commit | 52609c0b56d7c8dfb6e16ec0a715adf8fcbdae36 (patch) | |
| tree | 72189154cb9f420e6e38e6b10234917fa026c541 /net/core | |
| parent | [SHAPER]: Switch to spinlocks. (diff) | |
| download | linux-52609c0b56d7c8dfb6e16ec0a715adf8fcbdae36.tar.xz linux-52609c0b56d7c8dfb6e16ec0a715adf8fcbdae36.zip | |
[NET]: improve readability of dev_set_promiscuity() in net/core/dev.c
A trivial patch to improve the readability of dev_set_promiscuity()
in net/core/dev.c. New code does exactly the same thing as original
code.
Signed-off-by: David Chau <ddcc@mit.edu>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 7016e0c36b3d..7f5f62c65115 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2089,10 +2089,11 @@ void dev_set_promiscuity(struct net_device *dev, int inc) { unsigned short old_flags = dev->flags; - dev->flags |= IFF_PROMISC; if ((dev->promiscuity += inc) == 0) dev->flags &= ~IFF_PROMISC; - if (dev->flags ^ old_flags) { + else + dev->flags |= IFF_PROMISC; + if (dev->flags != old_flags) { dev_mc_upload(dev); printk(KERN_INFO "device %s %s promiscuous mode\n", dev->name, (dev->flags & IFF_PROMISC) ? "entered" : |