提交 da9fbfa7 编写于 作者: J Jozsef Kadlecsik

netfilter: ipset: Mark some helper args as const.

Mark some of the helpers arguments as const.

Ported from a patch proposed by Sergey Popovich <popovich_sergei@mail.ua>.
Suggested-by: NSergey Popovich <popovich_sergei@mail.ua>
Signed-off-by: NJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
上级 2da16a69
...@@ -346,7 +346,7 @@ ip_set_get_skbinfo(struct ip_set_skbinfo *skbinfo, ...@@ -346,7 +346,7 @@ ip_set_get_skbinfo(struct ip_set_skbinfo *skbinfo,
} }
static inline bool static inline bool
ip_set_put_skbinfo(struct sk_buff *skb, struct ip_set_skbinfo *skbinfo) ip_set_put_skbinfo(struct sk_buff *skb, const struct ip_set_skbinfo *skbinfo)
{ {
/* Send nonzero parameters only */ /* Send nonzero parameters only */
return ((skbinfo->skbmark || skbinfo->skbmarkmask) && return ((skbinfo->skbmark || skbinfo->skbmarkmask) &&
...@@ -373,7 +373,7 @@ ip_set_init_skbinfo(struct ip_set_skbinfo *skbinfo, ...@@ -373,7 +373,7 @@ ip_set_init_skbinfo(struct ip_set_skbinfo *skbinfo,
} }
static inline bool static inline bool
ip_set_put_counter(struct sk_buff *skb, struct ip_set_counter *counter) ip_set_put_counter(struct sk_buff *skb, const struct ip_set_counter *counter)
{ {
return nla_put_net64(skb, IPSET_ATTR_BYTES, return nla_put_net64(skb, IPSET_ATTR_BYTES,
cpu_to_be64(ip_set_get_bytes(counter)), cpu_to_be64(ip_set_get_bytes(counter)),
......
...@@ -43,7 +43,7 @@ ip_set_init_comment(struct ip_set_comment *comment, ...@@ -43,7 +43,7 @@ ip_set_init_comment(struct ip_set_comment *comment,
/* Used only when dumping a set, protected by rcu_read_lock_bh() */ /* Used only when dumping a set, protected by rcu_read_lock_bh() */
static inline int static inline int
ip_set_put_comment(struct sk_buff *skb, struct ip_set_comment *comment) ip_set_put_comment(struct sk_buff *skb, const struct ip_set_comment *comment)
{ {
struct ip_set_comment_rcu *c = rcu_dereference_bh(comment->c); struct ip_set_comment_rcu *c = rcu_dereference_bh(comment->c);
......
...@@ -40,7 +40,7 @@ ip_set_timeout_uget(struct nlattr *tb) ...@@ -40,7 +40,7 @@ ip_set_timeout_uget(struct nlattr *tb)
} }
static inline bool static inline bool
ip_set_timeout_expired(unsigned long *t) ip_set_timeout_expired(const unsigned long *t)
{ {
return *t != IPSET_ELEM_PERMANENT && time_is_before_jiffies(*t); return *t != IPSET_ELEM_PERMANENT && time_is_before_jiffies(*t);
} }
...@@ -63,7 +63,7 @@ ip_set_timeout_set(unsigned long *timeout, u32 value) ...@@ -63,7 +63,7 @@ ip_set_timeout_set(unsigned long *timeout, u32 value)
} }
static inline u32 static inline u32
ip_set_timeout_get(unsigned long *timeout) ip_set_timeout_get(const unsigned long *timeout)
{ {
return *timeout == IPSET_ELEM_PERMANENT ? 0 : return *timeout == IPSET_ELEM_PERMANENT ? 0 :
jiffies_to_msecs(*timeout - jiffies)/MSEC_PER_SEC; jiffies_to_msecs(*timeout - jiffies)/MSEC_PER_SEC;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册