[IA64] Eliminate NULL test after alloc_bootmem in iosapic_alloc_rte()

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

diff --git a/net/netfilter/xt_multiport.c b/net/netfilter/xt_multiport.c
index d03cc3768112a59cd95fade2eef3bfda9adae233..fd88c489b70e36b8c71f27bdfc9cb7653abef292 100644 (file)
--- a/net/netfilter/xt_multiport.c
+++ b/net/netfilter/xt_multiport.c
@@ -22,7 +22,7 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
-MODULE_DESCRIPTION("x_tables multiple port match module");
+MODULE_DESCRIPTION("Xtables: multiple port matching for TCP, UDP, UDP-Lite, SCTP and DCCP");
 MODULE_ALIAS("ipt_multiport");
 MODULE_ALIAS("ip6t_multiport");
 
@@ -100,7 +100,8 @@ multiport_mt_v0(const struct sk_buff *skb, const struct net_device *in,
                 const void *matchinfo, int offset, unsigned int protoff,
                 bool *hotdrop)
 {
-       __be16 _ports[2], *pptr;
+       const __be16 *pptr;
+       __be16 _ports[2];
        const struct xt_multiport *multiinfo = matchinfo;
 
        if (offset)
@@ -126,7 +127,8 @@ multiport_mt(const struct sk_buff *skb, const struct net_device *in,
              const void *matchinfo, int offset, unsigned int protoff,
              bool *hotdrop)
 {
-       __be16 _ports[2], *pptr;
+       const __be16 *pptr;
+       __be16 _ports[2];
        const struct xt_multiport_v1 *multiinfo = matchinfo;
 
        if (offset)