Merge commit 'kumar/merge' into merge

[linux-drm-fsl-dcu.git] / net / netfilter / xt_time.c

diff --git a/net/netfilter/xt_time.c b/net/netfilter/xt_time.c
index d8556fdda440258ba0587ca5d4909441a1799e1f..c48975ff8ea27c4d1e7d99ae60f67f1da94d8003 100644 (file)
--- a/net/netfilter/xt_time.c
+++ b/net/netfilter/xt_time.c
@@ -148,11 +148,10 @@ static void localtime_3(struct xtm *r, time_t time)
        }
 
        r->month    = i + 1;
-       return;
 }
 
 static bool
-time_mt(const struct sk_buff *skb, const struct xt_match_param *par)
+time_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
        const struct xt_time_info *info = par->matchinfo;
        unsigned int packet_time;