netdev
[Top] [All Lists]

[PATCH PKT_SCHED 11/17]: Remove checks for impossible conditions in ipt

To: jamal <hadi@xxxxxxxxxx>
Subject: [PATCH PKT_SCHED 11/17]: Remove checks for impossible conditions in ipt action
From: Patrick McHardy <kaber@xxxxxxxxx>
Date: Thu, 30 Dec 2004 04:40:27 +0100
Cc: Maillist netdev <netdev@xxxxxxxxxxx>
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.6) Gecko/20040413 Debian/1.6-5
Remove checks for impossible conditions in ipt action, same as for gact.

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/12/30 02:52:02+01:00 kaber@xxxxxxxxxxxx 
#   [PKT_SCHED]: Remove checks for impossible conditions in ipt action
#   
#   Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
# 
# net/sched/ipt.c
#   2004/12/30 02:51:56+01:00 kaber@xxxxxxxxxxxx +1 -9
#   [PKT_SCHED]: Remove checks for impossible conditions in ipt action
#   
#   Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
# 
diff -Nru a/net/sched/ipt.c b/net/sched/ipt.c
--- a/net/sched/ipt.c   2004-12-30 04:01:42 +01:00
+++ b/net/sched/ipt.c   2004-12-30 04:01:42 +01:00
@@ -104,8 +104,7 @@
        u32 index = 0;
        u32 hook = 0;
 
-       if (a == NULL || rta == NULL ||
-           rtattr_parse(tb, TCA_IPT_MAX, RTA_DATA(rta), RTA_PAYLOAD(rta)) < 0)
+       if (rtattr_parse(tb, TCA_IPT_MAX, RTA_DATA(rta), RTA_PAYLOAD(rta)) < 0)
                return -1;
 
        if (tb[TCA_IPT_INDEX - 1]) {
@@ -243,9 +242,6 @@
        struct tcf_ipt *p = PRIV(a, ipt);
        struct sk_buff *skb = *pskb;
 
-       if (p == NULL || skb == NULL)
-               return -1;
-
        spin_lock(&p->lock);
 
        p->tm.lastuse = jiffies;
@@ -293,10 +289,6 @@
        unsigned char *b = skb->tail;
        struct tcf_ipt *p = PRIV(a, ipt);
 
-       if (p == NULL) {
-               printk("BUG: tcf_ipt_dump called with NULL params\n");
-               goto rtattr_failure;
-       }
        /* for simple targets kernel size == user size
        ** user name = target name
        ** for foolproof you need to not assume this
<Prev in Thread] Current Thread [Next in Thread>