staging: et131x: Combine two if statements with same effect
authorMark Einon <mark.einon@gmail.com>
Thu, 11 Sep 2014 21:59:44 +0000 (22:59 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Sep 2014 23:02:12 +0000 (16:02 -0700)
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>
drivers/staging/et131x/et131x.c

index 732432edd394bfa8a7b04cac7bd681b4cd4f18f3..e9e269fddd2327941225c7445fa77be08a6739da 100644 (file)
@@ -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) {
This page took 0.036394 seconds and 5 git commands to generate.