1 files changed, 7 insertions, 17 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index ce3f25ff2737..d73ca2439681 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -471,9 +471,9 @@ union ring_type {
 #define NV_RX_AVAIL             (1<<31)
 
 #define NV_RX2_CHECKSUMMASK     (0x1C000000)
-#define NV_RX2_CHECKSUMOK1      (0x10000000)
-#define NV_RX2_CHECKSUMOK2      (0x14000000)
-#define NV_RX2_CHECKSUMOK3      (0x18000000)
+#define NV_RX2_CHECKSUM_IP      (0x10000000)
+#define NV_RX2_CHECKSUM_IP_TCP  (0x14000000)
+#define NV_RX2_CHECKSUM_IP_UDP  (0x18000000)
 #define NV_RX2_DESCRIPTORVALID  (1<<29)
 #define NV_RX2_SUBSTRACT1       (1<<25)
 #define NV_RX2_ERROR1           (1<<18)
@@ -2375,14 +2375,9 @@ static int nv_rx_process(struct net_device *dev, int limit)
                                                 goto next_pkt;
                                         }
                                 }
-                                if ((flags & NV_RX2_CHECKSUMMASK) == NV_RX2_CHECKSUMOK2)/*ip and tcp */ {
+                                if (((flags & NV_RX2_CHECKSUMMASK) == NV_RX2_CHECKSUM_IP_TCP) || /*ip and tcp */
+                                    ((flags & NV_RX2_CHECKSUMMASK) == NV_RX2_CHECKSUM_IP_UDP))   /*ip and udp */
                                         skb->ip_summed = CHECKSUM_UNNECESSARY;
-                                } else {
-                                        if ((flags & NV_RX2_CHECKSUMMASK) == NV_RX2_CHECKSUMOK1 ||
-                                            (flags & NV_RX2_CHECKSUMMASK) == NV_RX2_CHECKSUMOK3) {
-                                                skb->ip_summed = CHECKSUM_UNNECESSARY;
-                                        }
-                                }
                         } else {
                                 dev_kfree_skb(skb);
                                 goto next_pkt;
@@ -2474,14 +2469,9 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit)
                                 }
                         }
 
-                        if ((flags & NV_RX2_CHECKSUMMASK) == NV_RX2_CHECKSUMOK2)/*ip and tcp */ {
+                        if (((flags & NV_RX2_CHECKSUMMASK) == NV_RX2_CHECKSUM_IP_TCP) || /*ip and tcp */
+                            ((flags & NV_RX2_CHECKSUMMASK) == NV_RX2_CHECKSUM_IP_UDP))   /*ip and udp */
                                 skb->ip_summed = CHECKSUM_UNNECESSARY;
-                        } else {
-                                if ((flags & NV_RX2_CHECKSUMMASK) == NV_RX2_CHECKSUMOK1 ||
-                                    (flags & NV_RX2_CHECKSUMMASK) == NV_RX2_CHECKSUMOK3) {
-                                        skb->ip_summed = CHECKSUM_UNNECESSARY;
-                                }
-                        }
 
                         /* got a valid packet - forward it to the network core */
                         skb_put(skb, len);