Merge branch 'upstream' of git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6] / net / netfilter / xt_policy.c

diff --git a/net/netfilter/xt_policy.c b/net/netfilter/xt_policy.c
index 1534de55cdb6dfc9912c7fa339d35cc5c563a4c9..6d6d3b7fcbb5c18b88f8021a8c096debcceffe86 100644 (file)
--- a/net/netfilter/xt_policy.c
+++ b/net/netfilter/xt_policy.c
@@ -34,7 +34,7 @@ xt_addr_cmp(const union xt_policy_addr *a1, const union xt_policy_addr *m,
 }
 
 static inline bool
-match_xfrm_state(struct xfrm_state *x, const struct xt_policy_elem *e,
+match_xfrm_state(const struct xfrm_state *x, const struct xt_policy_elem *e,
                 unsigned short family)
 {
 #define MATCH_ADDR(x,y,z)      (!e->match.x ||                        \
@@ -55,7 +55,7 @@ match_policy_in(const struct sk_buff *skb, const struct xt_policy_info *info,
                unsigned short family)
 {
        const struct xt_policy_elem *e;
-       struct sec_path *sp = skb->sp;
+       const struct sec_path *sp = skb->sp;
        int strict = info->flags & XT_POLICY_MATCH_STRICT;
        int i, pos;
 
@@ -85,7 +85,7 @@ match_policy_out(const struct sk_buff *skb, const struct xt_policy_info *info,
                 unsigned short family)
 {
        const struct xt_policy_elem *e;
-       struct dst_entry *dst = skb->dst;
+       const struct dst_entry *dst = skb->dst;
        int strict = info->flags & XT_POLICY_MATCH_STRICT;
        int i, pos;
 
@@ -164,7 +164,7 @@ static bool checkentry(const char *tablename, const void *ip_void,
        return true;
 }
 
-static struct xt_match xt_policy_match[] = {
+static struct xt_match xt_policy_match[] __read_mostly = {
        {
                .name           = "policy",
                .family         = AF_INET,