[ARM] Fix build error caused by move of apm

[linux-2.6-omap-h63xx.git] / net / netfilter / xt_CONNMARK.c

diff --git a/net/netfilter/xt_CONNMARK.c b/net/netfilter/xt_CONNMARK.c
index 0534bfa65cce290d5aed268d68af2be33f8c5b08..795c058b16a5bbd2dbf6c5b1273256d73ab8b1fa 100644 (file)
--- a/net/netfilter/xt_CONNMARK.c
+++ b/net/netfilter/xt_CONNMARK.c
@@ -61,7 +61,7 @@ target(struct sk_buff **pskb,
 #else
                                nf_conntrack_event_cache(IPCT_MARK, *pskb);
 #endif
-               }
+                       }
                        break;
                case XT_CONNMARK_SAVE:
                        newmark = (*ctmark & ~markinfo->mask) |
@@ -78,8 +78,7 @@ target(struct sk_buff **pskb,
                case XT_CONNMARK_RESTORE:
                        mark = (*pskb)->mark;
                        diff = (*ctmark ^ mark) & markinfo->mask;
-                       if (diff != 0)
-                               (*pskb)->mark = mark ^ diff;
+                       (*pskb)->mark = mark ^ diff;
                        break;
                }
        }