From 489e791467484cbe573e88d988157ff54ab29100 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 25 Jul 2011 16:17:35 -0700 Subject: [PATCH] --- yaml --- r: 261049 b: refs/heads/master c: 2d348d1f569f051d2609b04d27bb55cd25eda8fe h: refs/heads/master i: 261047: 094baaf57667c8379aee0acd0708d04f16409c30 v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 2 +- trunk/net/core/dev.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dfa8838bc094..12672df68384 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48daec034b2669c634983d0435beac41190b4c91 +refs/heads/master: 2d348d1f569f051d2609b04d27bb55cd25eda8fe diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 34f3abc6457a..1d92acc0777b 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -1132,7 +1132,7 @@ struct net_device { spinlock_t addr_list_lock; struct netdev_hw_addr_list uc; /* Unicast mac addresses */ struct netdev_hw_addr_list mc; /* Multicast mac addresses */ - int uc_promisc; + bool uc_promisc; unsigned int promiscuity; unsigned int allmulti; diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 9444c5cb4137..17d67b579beb 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -4497,10 +4497,10 @@ void __dev_set_rx_mode(struct net_device *dev) */ if (!netdev_uc_empty(dev) && !dev->uc_promisc) { __dev_set_promiscuity(dev, 1); - dev->uc_promisc = 1; + dev->uc_promisc = true; } else if (netdev_uc_empty(dev) && dev->uc_promisc) { __dev_set_promiscuity(dev, -1); - dev->uc_promisc = 0; + dev->uc_promisc = false; } if (ops->ndo_set_multicast_list)