diff options
| author | Joe Perches <joe@perches.com> | 2011-07-25 19:17:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-25 19:17:35 -0400 |
| commit | 2d348d1f569f051d2609b04d27bb55cd25eda8fe (patch) | |
| tree | 877e13a3ae4ac76c7a64911c10f5600a314e56ab | |
| parent | 48daec034b2669c634983d0435beac41190b4c91 (diff) | |
net: Convert struct net_device uc_promisc to bool
No need to use int, its uses are boolean.
May save a few bytes one day.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/netdevice.h | 2 | ||||
| -rw-r--r-- | net/core/dev.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 34f3abc6457a..1d92acc0777b 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -1132,7 +1132,7 @@ struct net_device { | |||
| 1132 | spinlock_t addr_list_lock; | 1132 | spinlock_t addr_list_lock; |
| 1133 | struct netdev_hw_addr_list uc; /* Unicast mac addresses */ | 1133 | struct netdev_hw_addr_list uc; /* Unicast mac addresses */ |
| 1134 | struct netdev_hw_addr_list mc; /* Multicast mac addresses */ | 1134 | struct netdev_hw_addr_list mc; /* Multicast mac addresses */ |
| 1135 | int uc_promisc; | 1135 | bool uc_promisc; |
| 1136 | unsigned int promiscuity; | 1136 | unsigned int promiscuity; |
| 1137 | unsigned int allmulti; | 1137 | unsigned int allmulti; |
| 1138 | 1138 | ||
diff --git a/net/core/dev.c b/net/core/dev.c index 9444c5cb4137..17d67b579beb 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -4497,10 +4497,10 @@ void __dev_set_rx_mode(struct net_device *dev) | |||
| 4497 | */ | 4497 | */ |
| 4498 | if (!netdev_uc_empty(dev) && !dev->uc_promisc) { | 4498 | if (!netdev_uc_empty(dev) && !dev->uc_promisc) { |
| 4499 | __dev_set_promiscuity(dev, 1); | 4499 | __dev_set_promiscuity(dev, 1); |
| 4500 | dev->uc_promisc = 1; | 4500 | dev->uc_promisc = true; |
| 4501 | } else if (netdev_uc_empty(dev) && dev->uc_promisc) { | 4501 | } else if (netdev_uc_empty(dev) && dev->uc_promisc) { |
| 4502 | __dev_set_promiscuity(dev, -1); | 4502 | __dev_set_promiscuity(dev, -1); |
| 4503 | dev->uc_promisc = 0; | 4503 | dev->uc_promisc = false; |
| 4504 | } | 4504 | } |
| 4505 | 4505 | ||
| 4506 | if (ops->ndo_set_multicast_list) | 4506 | if (ops->ndo_set_multicast_list) |
