From patchwork Thu Dec 10 01:25:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: laurent chavey X-Patchwork-Id: 40773 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 1EEC8B7BC5 for ; Thu, 10 Dec 2009 12:25:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759351AbZLJBZD (ORCPT ); Wed, 9 Dec 2009 20:25:03 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759346AbZLJBZC (ORCPT ); Wed, 9 Dec 2009 20:25:02 -0500 Received: from smtp-out.google.com ([216.239.33.17]:35961 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759342AbZLJBZA (ORCPT ); Wed, 9 Dec 2009 20:25:00 -0500 Received: from wpaz13.hot.corp.google.com (wpaz13.hot.corp.google.com [172.24.198.77]) by smtp-out.google.com with ESMTP id nBA1P6iI001037 for ; Thu, 10 Dec 2009 01:25:06 GMT DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1260408306; bh=+0SniDb/Aq/u0d1QfCCjasCoKcw=; h=From:Date:Message-Id:To:CC:Subject; b=PazfB8d5GNCda+lKbDWu2RwdZIx/xep2K6yXVV3/vPwRKXvcvvdSEW1Ll7/oUHM1S upum/e8mHtiux88U1KG+g== DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=from:date:message-id:to:cc:subject:x-system-of-record; b=sI3L7UvUKtvkk+Pk82gPc4ua4nA50gfQW1WLM5iJ0xtxbrFUUTspNEc0FdoGuAmwX F/c+ly8O4q6ZsQpQXmKfQ== Received: from gxk3 (gxk3.prod.google.com [10.202.11.3]) by wpaz13.hot.corp.google.com with ESMTP id nBA1P3ia006328 for ; Wed, 9 Dec 2009 17:25:04 -0800 Received: by gxk3 with SMTP id 3so686152gxk.1 for ; Wed, 09 Dec 2009 17:25:03 -0800 (PST) Received: by 10.150.37.36 with SMTP id k36mr17526240ybk.335.1260408303286; Wed, 09 Dec 2009 17:25:03 -0800 (PST) Received: from chavey.mtv.corp.google.com (chavey.mtv.corp.google.com [172.22.64.28]) by mx.google.com with ESMTPS id 9sm171727ywf.20.2009.12.09.17.25.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 09 Dec 2009 17:25:02 -0800 (PST) From: chavey@google.com Date: Wed, 09 Dec 2009 17:25:00 -0800 Message-Id: To: davem@davemloft.net CC: netdev@vger.kernel.org, chavey@google.com Subject: [PATCH] netfilter: Fix compiler warning. X-System-Of-Record: true Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix compiler warning "discards qualifiers from pointer target type". The function prototype defines parameters as pointer to a constant. Such parameters should not have their content modified in the function. Signed-off-by: Laurent Chavey --- net/ipv4/netfilter/ipt_ULOG.c | 6 ++++-- net/netfilter/xt_time.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c index d32cc4b..8490f9f 100644 --- a/net/ipv4/netfilter/ipt_ULOG.c +++ b/net/ipv4/netfilter/ipt_ULOG.c @@ -166,6 +166,7 @@ static void ipt_ulog_packet(unsigned int hooknum, size_t size, copy_len; struct nlmsghdr *nlh; struct timeval tv; + ktime_t tstamp; /* ffs == find first bit set, necessary because userspace * is already shifting groupnumber, but we need unshifted. @@ -208,13 +209,14 @@ static void ipt_ulog_packet(unsigned int hooknum, pm = NLMSG_DATA(nlh); + tstamp = skb->tstamp; /* We might not have a timestamp, get one */ if (skb->tstamp.tv64 == 0) - __net_timestamp((struct sk_buff *)skb); + tstamp = ktime_get_real(); /* copy hook, prefix, timestamp, payload, etc. */ pm->data_len = copy_len; - tv = ktime_to_timeval(skb->tstamp); + tv = ktime_to_timeval(tstamp); put_unaligned(tv.tv_sec, &pm->timestamp_sec); put_unaligned(tv.tv_usec, &pm->timestamp_usec); put_unaligned(skb->mark, &pm->mark); diff --git a/net/netfilter/xt_time.c b/net/netfilter/xt_time.c index 93acaa5..66e2a75 100644 --- a/net/netfilter/xt_time.c +++ b/net/netfilter/xt_time.c @@ -159,6 +159,7 @@ time_mt(const struct sk_buff *skb, const struct xt_match_param *par) unsigned int packet_time; struct xtm current_time; s64 stamp; + ktime_t tstamp; /* * We cannot use get_seconds() instead of __net_timestamp() here. @@ -169,10 +170,11 @@ time_mt(const struct sk_buff *skb, const struct xt_match_param *par) * may happen that the same packet matches both rules if * it arrived at the right moment before 13:00. */ + tstamp = skb->tstamp; if (skb->tstamp.tv64 == 0) - __net_timestamp((struct sk_buff *)skb); + tstamp = ktime_get_real(); - stamp = ktime_to_ns(skb->tstamp); + stamp = ktime_to_ns(tstamp); stamp = div_s64(stamp, NSEC_PER_SEC); if (info->flags & XT_TIME_LOCAL_TZ)