10 files changed, 39 insertions, 28 deletions

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index e82339a78c01..2de7ae0180aa 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -235,12 +235,13 @@ clusterip_del_node(struct clusterip_config *c, u_int16_t nodenum)
 #endif
 
 static inline u_int32_t
-clusterip_hashfn(struct sk_buff *skb, struct clusterip_config *config)
+clusterip_hashfn(const struct sk_buff *skb,
+                 const struct clusterip_config *config)
 {
-        struct iphdr *iph = ip_hdr(skb);
+        const struct iphdr *iph = ip_hdr(skb);
         unsigned long hashval;
         u_int16_t sport, dport;
-        u_int16_t *ports;
+        const u_int16_t *ports;
 
         switch (iph->protocol) {
         case IPPROTO_TCP:
@@ -249,7 +250,7 @@ clusterip_hashfn(struct sk_buff *skb, struct clusterip_config *config)
         case IPPROTO_SCTP:
         case IPPROTO_DCCP:
         case IPPROTO_ICMP:
-                ports = (void *)iph+iph->ihl*4;
+                ports = (const void *)iph+iph->ihl*4;
                 sport = ports[0];
                 dport = ports[1];
                 break;
@@ -289,7 +290,7 @@ clusterip_hashfn(struct sk_buff *skb, struct clusterip_config *config)
 }
 
 static inline int
-clusterip_responsible(struct clusterip_config *config, u_int32_t hash)
+clusterip_responsible(const struct clusterip_config *config, u_int32_t hash)
 {
         return test_bit(hash - 1, &config->local_nodes);
 }
diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/ipt_LOG.c
index bbff6c352ef8..bcc43a625e72 100644
--- a/net/ipv4/netfilter/ipt_LOG.c
+++ b/net/ipv4/netfilter/ipt_LOG.c
@@ -41,7 +41,8 @@ static void dump_packet(const struct nf_loginfo *info,
                         const struct sk_buff *skb,
                         unsigned int iphoff)
 {
-        struct iphdr _iph, *ih;
+        struct iphdr _iph;
+        const struct iphdr *ih;
         unsigned int logflags;
 
         if (info->type == NF_LOG_TYPE_LOG)
@@ -100,7 +101,8 @@ static void dump_packet(const struct nf_loginfo *info,
 
         switch (ih->protocol) {
         case IPPROTO_TCP: {
-                struct tcphdr _tcph, *th;
+                struct tcphdr _tcph;
+                const struct tcphdr *th;
 
                 /* Max length: 10 "PROTO=TCP " */
                 printk("PROTO=TCP ");
@@ -151,7 +153,7 @@ static void dump_packet(const struct nf_loginfo *info,
                 if ((logflags & IPT_LOG_TCPOPT)
                     && th->doff * 4 > sizeof(struct tcphdr)) {
                         unsigned char _opt[4 * 15 - sizeof(struct tcphdr)];
-                        unsigned char *op;
+                        const unsigned char *op;
                         unsigned int i, optsize;
 
                         optsize = th->doff * 4 - sizeof(struct tcphdr);
@@ -173,7 +175,8 @@ static void dump_packet(const struct nf_loginfo *info,
         }
         case IPPROTO_UDP:
         case IPPROTO_UDPLITE: {
-                struct udphdr _udph, *uh;
+                struct udphdr _udph;
+                const struct udphdr *uh;
 
                 if (ih->protocol == IPPROTO_UDP)
                         /* Max length: 10 "PROTO=UDP "     */
@@ -200,7 +203,8 @@ static void dump_packet(const struct nf_loginfo *info,
                 break;
         }
         case IPPROTO_ICMP: {
-                struct icmphdr _icmph, *ich;
+                struct icmphdr _icmph;
+                const struct icmphdr *ich;
                 static const size_t required_len[NR_ICMP_TYPES+1]
                         = { [ICMP_ECHOREPLY] = 4,
                             [ICMP_DEST_UNREACH]
@@ -285,7 +289,8 @@ static void dump_packet(const struct nf_loginfo *info,
         }
         /* Max Length */
         case IPPROTO_AH: {
-                struct ip_auth_hdr _ahdr, *ah;
+                struct ip_auth_hdr _ahdr;
+                const struct ip_auth_hdr *ah;
 
                 if (ntohs(ih->frag_off) & IP_OFFSET)
                         break;
@@ -307,7 +312,8 @@ static void dump_packet(const struct nf_loginfo *info,
                 break;
         }
         case IPPROTO_ESP: {
-                struct ip_esp_hdr _esph, *eh;
+                struct ip_esp_hdr _esph;
+                const struct ip_esp_hdr *eh;
 
                 /* Max length: 10 "PROTO=ESP " */
                 printk("PROTO=ESP ");
@@ -385,11 +391,13 @@ ipt_log_packet(unsigned int pf,
                out ? out->name : "");
 #ifdef CONFIG_BRIDGE_NETFILTER
         if (skb->nf_bridge) {
-                struct net_device *physindev = skb->nf_bridge->physindev;
-                struct net_device *physoutdev = skb->nf_bridge->physoutdev;
+                const struct net_device *physindev;
+                const struct net_device *physoutdev;
 
+                physindev = skb->nf_bridge->physindev;
                 if (physindev && in != physindev)
                         printk("PHYSIN=%s ", physindev->name);
+                physoutdev = skb->nf_bridge->physoutdev;
                 if (physoutdev && out != physoutdev)
                         printk("PHYSOUT=%s ", physoutdev->name);
         }
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
index b5b216408ee7..846a0e727218 100644
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -70,7 +70,7 @@ masquerade_target(struct sk_buff **pskb,
         enum ip_conntrack_info ctinfo;
         struct nf_nat_range newrange;
         const struct nf_nat_multi_range_compat *mr;
-        struct rtable *rt;
+        const struct rtable *rt;
         __be32 newsrc;
 
         NF_CT_ASSERT(hooknum == NF_IP_POST_ROUTING);
@@ -112,7 +112,7 @@ masquerade_target(struct sk_buff **pskb,
 static inline int
 device_cmp(struct nf_conn *i, void *ifindex)
 {
-        struct nf_conn_nat *nat = nfct_nat(i);
+        const struct nf_conn_nat *nat = nfct_nat(i);
         int ret;
 
         if (!nat)
@@ -129,7 +129,7 @@ static int masq_device_event(struct notifier_block *this,
                              unsigned long event,
                              void *ptr)
 {
-        struct net_device *dev = ptr;
+        const struct net_device *dev = ptr;
 
         if (event == NETDEV_DOWN) {
                 /* Device was downed.  Search entire table for
@@ -147,7 +147,7 @@ static int masq_inet_event(struct notifier_block *this,
                            unsigned long event,
                            void *ptr)
 {
-        struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev;
+        const struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev;
 
         if (event == NETDEV_DOWN) {
                 /* IP address was deleted.  Search entire table for
diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/ipt_REJECT.c
index 5c3270d325f3..90f7b7093785 100644
--- a/net/ipv4/netfilter/ipt_REJECT.c
+++ b/net/ipv4/netfilter/ipt_REJECT.c
@@ -122,7 +122,7 @@ static void send_reset(struct sk_buff *oldskb, int hook)
         tcph->check = 0;
         tcph->check = tcp_v4_check(sizeof(struct tcphdr),
                                    niph->saddr, niph->daddr,
-                                   csum_partial((char *)tcph,
+                                   csum_partial(tcph,
                                                 sizeof(struct tcphdr), 0));
 
         /* Set DF, id = 0 */
diff --git a/net/ipv4/netfilter/ipt_TTL.c b/net/ipv4/netfilter/ipt_TTL.c
index 96b6e3514c22..f53f2c4ca4a1 100644
--- a/net/ipv4/netfilter/ipt_TTL.c
+++ b/net/ipv4/netfilter/ipt_TTL.c
@@ -68,7 +68,7 @@ static bool ipt_ttl_checkentry(const char *tablename,
                 void *targinfo,
                 unsigned int hook_mask)
 {
-        struct ipt_TTL_info *info = targinfo;
+        const struct ipt_TTL_info *info = targinfo;
 
         if (info->mode > IPT_TTL_MAXMODE) {
                 printk(KERN_WARNING "ipt_TTL: invalid or unknown Mode %u\n",
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index dfa7afd84763..282eb00fc471 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -334,7 +334,7 @@ static bool ipt_ulog_checkentry(const char *tablename,
                                 void *targinfo,
                                 unsigned int hookmask)
 {
-        struct ipt_ulog_info *loginfo = (struct ipt_ulog_info *) targinfo;
+        const struct ipt_ulog_info *loginfo = targinfo;
 
         if (loginfo->prefix[sizeof(loginfo->prefix) - 1] != '\0') {
                 DEBUGP("ipt_ULOG: prefix term %i\n",
@@ -359,7 +359,7 @@ struct compat_ipt_ulog_info {
 
 static void compat_from_user(void *dst, void *src)
 {
-        struct compat_ipt_ulog_info *cl = src;
+        const struct compat_ipt_ulog_info *cl = src;
         struct ipt_ulog_info l = {
                 .nl_group       = cl->nl_group,
                 .copy_range     = cl->copy_range,
@@ -372,7 +372,7 @@ static void compat_from_user(void *dst, void *src)
 
 static int compat_to_user(void __user *dst, void *src)
 {
-        struct ipt_ulog_info *l = src;
+        const struct ipt_ulog_info *l = src;
         struct compat_ipt_ulog_info cl = {
                 .nl_group       = l->nl_group,
                 .copy_range     = l->copy_range,
diff --git a/net/ipv4/netfilter/ipt_ah.c b/net/ipv4/netfilter/ipt_ah.c
index 6b5b7c9f7392..49d503cbab09 100644
--- a/net/ipv4/netfilter/ipt_ah.c
+++ b/net/ipv4/netfilter/ipt_ah.c
@@ -46,7 +46,8 @@ match(const struct sk_buff *skb,
       unsigned int protoff,
       bool *hotdrop)
 {
-        struct ip_auth_hdr _ahdr, *ah;
+        struct ip_auth_hdr _ahdr;
+        const struct ip_auth_hdr *ah;
         const struct ipt_ah *ahinfo = matchinfo;
 
         /* Must not be a fragment. */
diff --git a/net/ipv4/netfilter/ipt_ecn.c b/net/ipv4/netfilter/ipt_ecn.c
index ba4f5497add3..3129e3106162 100644
--- a/net/ipv4/netfilter/ipt_ecn.c
+++ b/net/ipv4/netfilter/ipt_ecn.c
@@ -32,7 +32,8 @@ static inline bool match_tcp(const struct sk_buff *skb,
                              const struct ipt_ecn_info *einfo,
                              bool *hotdrop)
 {
-        struct tcphdr _tcph, *th;
+        struct tcphdr _tcph;
+        const struct tcphdr *th;
 
         /* In practice, TCP match does this, so can't fail.  But let's
          * be good citizens.
diff --git a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c
index d632e0e6ef16..d03e6a6eb767 100644
--- a/net/ipv4/netfilter/ipt_recent.c
+++ b/net/ipv4/netfilter/ipt_recent.c
@@ -323,7 +323,7 @@ struct recent_iter_state {
 static void *recent_seq_start(struct seq_file *seq, loff_t *pos)
 {
         struct recent_iter_state *st = seq->private;
-        struct recent_table *t = st->table;
+        const struct recent_table *t = st->table;
         struct recent_entry *e;
         loff_t p = *pos;
 
diff --git a/net/ipv4/netfilter/nf_nat_helper.c b/net/ipv4/netfilter/nf_nat_helper.c
index b1aa5983a95b..ef0a99e09fd1 100644
--- a/net/ipv4/netfilter/nf_nat_helper.c
+++ b/net/ipv4/netfilter/nf_nat_helper.c
@@ -190,7 +190,7 @@ nf_nat_mangle_tcp_packet(struct sk_buff **pskb,
                         tcph->check = 0;
                         tcph->check = tcp_v4_check(datalen,
                                                    iph->saddr, iph->daddr,
-                                                   csum_partial((char *)tcph,
+                                                   csum_partial(tcph,
                                                                 datalen, 0));
                 }
         } else
@@ -278,7 +278,7 @@ nf_nat_mangle_udp_packet(struct sk_buff **pskb,
                         udph->check = 0;
                         udph->check = csum_tcpudp_magic(iph->saddr, iph->daddr,
                                                         datalen, IPPROTO_UDP,
-                                                        csum_partial((char *)udph,
+                                                        csum_partial(udph,
                                                                      datalen, 0));
                         if (!udph->check)
                                 udph->check = CSUM_MANGLED_0;