From 668caa674c045bb59dcde2dc017e254f18a90607 Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Thu, 11 Sep 2014 22:59:44 +0100 Subject: 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/et131x/et131x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/staging/et131x/et131x.c') 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) { -- cgit v1.2.3-59-g8ed1b