summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid Chau <ddcc@mit.edu>2005-07-05 15:11:06 -0700
committerDavid S. Miller <davem@davemloft.net>2005-07-05 15:11:06 -0700
commit52609c0b56d7c8dfb6e16ec0a715adf8fcbdae36 (patch)
tree72189154cb9f420e6e38e6b10234917fa026c541 /net
parentbc971dee6ece1fd0d431948924becd9c50e7b778 (diff)
downloadkernel-crypto-52609c0b56d7c8dfb6e16ec0a715adf8fcbdae36.tar.gz
kernel-crypto-52609c0b56d7c8dfb6e16ec0a715adf8fcbdae36.tar.xz
kernel-crypto-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')
-rw-r--r--net/core/dev.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 7016e0c36b3..7f5f62c6511 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" :