netdev
[Top] [All Lists]

[PATCH 2.4]: Remove unnecessary memset in packet schedulers

To: "David S. Miller" <davem@xxxxxxxxxx>
Subject: [PATCH 2.4]: Remove unnecessary memset in packet schedulers
From: Patrick McHardy <kaber@xxxxxxxxx>
Date: Tue, 17 Aug 2004 02:08:44 +0200
Cc: 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
Same patch for 2.4:

This patch removes some more unnecessary memsets in packet
schedulers. The qdisc's private data is already set to 0
in qdisc_create/qdisc_create_dflt.

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/08/17 01:23:21+02:00 kaber@xxxxxxxxxxxx 
#   [PKT_SCHED]: remove unnecessary memsets in packet schedulers
#   
#   Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
# 
# net/sched/sch_ingress.c
#   2004/08/17 01:23:16+02:00 kaber@xxxxxxxxxxxx +0 -5
#   [PKT_SCHED]: remove unnecessary memsets in packet schedulers
# 
# net/sched/sch_htb.c
#   2004/08/17 01:23:16+02:00 kaber@xxxxxxxxxxxx +0 -1
#   [PKT_SCHED]: remove unnecessary memsets in packet schedulers
# 
# net/sched/sch_hfsc.c
#   2004/08/17 01:23:16+02:00 kaber@xxxxxxxxxxxx +0 -1
#   [PKT_SCHED]: remove unnecessary memsets in packet schedulers
# 
# net/sched/sch_dsmark.c
#   2004/08/17 01:23:16+02:00 kaber@xxxxxxxxxxxx +0 -2
#   [PKT_SCHED]: remove unnecessary memsets in packet schedulers
# 
# net/sched/sch_atm.c
#   2004/08/17 01:23:16+02:00 kaber@xxxxxxxxxxxx +0 -1
#   [PKT_SCHED]: remove unnecessary memsets in packet schedulers
# 
diff -Nru a/net/sched/sch_atm.c b/net/sched/sch_atm.c
--- a/net/sched/sch_atm.c       2004-08-17 01:24:28 +02:00
+++ b/net/sched/sch_atm.c       2004-08-17 01:24:28 +02:00
@@ -566,7 +566,6 @@
        struct atm_qdisc_data *p = PRIV(sch);
 
        DPRINTK("atm_tc_init(sch %p,[qdisc %p],opt %p)\n",sch,p,opt);
-       memset(p,0,sizeof(*p));
        p->flows = &p->link;
        if(!(p->link.q = qdisc_create_dflt(sch->dev,&pfifo_qdisc_ops)))
                p->link.q = &noop_qdisc;
diff -Nru a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
--- a/net/sched/sch_dsmark.c    2004-08-17 01:24:28 +02:00
+++ b/net/sched/sch_dsmark.c    2004-08-17 01:24:28 +02:00
@@ -329,8 +329,6 @@
            !tb[TCA_DSMARK_INDICES-1] ||
            RTA_PAYLOAD(tb[TCA_DSMARK_INDICES-1]) < sizeof(__u16))
                 return -EINVAL;
-       memset(p,0,sizeof(*p));
-       p->filter_list = NULL;
        p->indices = *(__u16 *) RTA_DATA(tb[TCA_DSMARK_INDICES-1]);
        if (!p->indices)
                return -EINVAL;
diff -Nru a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
--- a/net/sched/sch_hfsc.c      2004-08-17 01:24:28 +02:00
+++ b/net/sched/sch_hfsc.c      2004-08-17 01:24:28 +02:00
@@ -1525,7 +1525,6 @@
                return -EINVAL;
        qopt = RTA_DATA(opt);
 
-       memset(q, 0, sizeof(struct hfsc_sched));
        sch->stats.lock = &sch->dev->queue_lock;
 
        q->defcls = qopt->defcls;
diff -Nru a/net/sched/sch_htb.c b/net/sched/sch_htb.c
--- a/net/sched/sch_htb.c       2004-08-17 01:24:28 +02:00
+++ b/net/sched/sch_htb.c       2004-08-17 01:24:28 +02:00
@@ -1186,7 +1186,6 @@
                                HTB_VER >> 16,HTB_VER & 0xffff,gopt->version);
                return -EINVAL;
        }
-       memset(q,0,sizeof(*q));
        q->debug = gopt->debug;
        HTB_DBG(0,1,"htb_init sch=%p handle=%X 
r2q=%d\n",sch,sch->handle,gopt->rate2quantum);
 
diff -Nru a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
--- a/net/sched/sch_ingress.c   2004-08-17 01:24:28 +02:00
+++ b/net/sched/sch_ingress.c   2004-08-17 01:24:28 +02:00
@@ -254,8 +254,6 @@
        }
 
        DPRINTK("ingress_init(sch %p,[qdisc %p],opt %p)\n",sch,p,opt);
-       memset(p, 0, sizeof(*p));
-       p->filter_list = NULL;
        p->q = &noop_qdisc;
        MOD_INC_USE_COUNT;
        return 0;
@@ -296,9 +294,6 @@
                p->filter_list = tp->next;
                tcf_destroy(tp);
        }
-       memset(p, 0, sizeof(*p));
-       p->filter_list = NULL;
-
 #if 0
 /* for future use */
        qdisc_destroy(p->q);
<Prev in Thread] Current Thread [Next in Thread>