diff options
| author |   Mark Einon <mark.einon@gmail.com> | 2014-09-11 22:59:44 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-19 16:02:12 -0700 |
| commit | 668caa674c045bb59dcde2dc017e254f18a90607 (patch) | |
| tree | f4bc2d0036c40610ced2853d4bbb230e6dd79e9d /drivers/staging/et131x/et131x.c | |
| parent | staging: et131x: Remove struct tcb->flags (diff) | |
| download | linux-dev-668caa674c045bb59dcde2dc017e254f18a90607.tar.xz linux-dev-668caa674c045bb59dcde2dc017e254f18a90607.zip | |
staging: et131x: Combine two if statements with same effect
Both these if statements have the same effect when true, so combine
them and save a few lines.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/et131x/et131x.c')
| -rw-r--r-- | drivers/staging/et131x/et131x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 732432edd394..e9e269fddd23 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -4137,10 +4137,8 @@ static void et131x_multicast(struct net_device *netdev) else adapter->packet_filter &= ~ET131X_PACKET_TYPE_PROMISCUOUS; - if (netdev->flags & IFF_ALLMULTI) - adapter->packet_filter |= ET131X_PACKET_TYPE_ALL_MULTICAST; - - if (netdev_mc_count(netdev) > NIC_MAX_MCAST_LIST) + if ((netdev->flags & IFF_ALLMULTI) || + (netdev_mc_count(netdev) > NIC_MAX_MCAST_LIST)) adapter->packet_filter |= ET131X_PACKET_TYPE_ALL_MULTICAST; if (netdev_mc_count(netdev) < 1) { |