diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
| commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
| tree | a96c26a370beb23282a561ddd936e5d0aa93adde /net/core/dev.c | |
| parent | 2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff) | |
| parent | 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'net/core/dev.c')
| -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) | |||
| 2089 | { | 2089 | { |
| 2090 | unsigned short old_flags = dev->flags; | 2090 | unsigned short old_flags = dev->flags; |
| 2091 | 2091 | ||
| 2092 | dev->flags |= IFF_PROMISC; | ||
| 2093 | if ((dev->promiscuity += inc) == 0) | 2092 | if ((dev->promiscuity += inc) == 0) |
| 2094 | dev->flags &= ~IFF_PROMISC; | 2093 | dev->flags &= ~IFF_PROMISC; |
| 2095 | if (dev->flags ^ old_flags) { | 2094 | else |
| 2095 | dev->flags |= IFF_PROMISC; | ||
| 2096 | if (dev->flags != old_flags) { | ||
| 2096 | dev_mc_upload(dev); | 2097 | dev_mc_upload(dev); |
| 2097 | printk(KERN_INFO "device %s %s promiscuous mode\n", | 2098 | printk(KERN_INFO "device %s %s promiscuous mode\n", |
| 2098 | dev->name, (dev->flags & IFF_PROMISC) ? "entered" : | 2099 | dev->name, (dev->flags & IFF_PROMISC) ? "entered" : |