aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuan Jiong <duanj.fnst@cn.fujitsu.com>2014-06-18 04:48:39 -0400
committerDavid S. Miller <davem@davemloft.net>2014-06-21 18:40:22 -0400
commit2b74e2caece67798195228775306aa97dbc51516 (patch)
tree01bd471f1a4583baa1b317d3f290d85b5fa6f714
parenta3f5ee71cdec56543e0420a788dc7df335944dd5 (diff)
net: em_canid: remove useless statements from em_canid_change
tcf_ematch is allocated by kzalloc in function tcf_em_tree_validate(), so cm_old is always NULL. Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/em_canid.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/net/sched/em_canid.c b/net/sched/em_canid.c
index bfd34e4c1afc..7c292d474f47 100644
--- a/net/sched/em_canid.c
+++ b/net/sched/em_canid.c
@@ -125,7 +125,6 @@ static int em_canid_change(struct tcf_proto *tp, void *data, int len,
125{ 125{
126 struct can_filter *conf = data; /* Array with rules */ 126 struct can_filter *conf = data; /* Array with rules */
127 struct canid_match *cm; 127 struct canid_match *cm;
128 struct canid_match *cm_old = (struct canid_match *)m->data;
129 int i; 128 int i;
130 129
131 if (!len) 130 if (!len)
@@ -181,12 +180,6 @@ static int em_canid_change(struct tcf_proto *tp, void *data, int len,
181 180
182 m->datalen = sizeof(struct canid_match) + len; 181 m->datalen = sizeof(struct canid_match) + len;
183 m->data = (unsigned long)cm; 182 m->data = (unsigned long)cm;
184
185 if (cm_old != NULL) {
186 pr_err("canid: Configuring an existing ematch!\n");
187 kfree(cm_old);
188 }
189
190 return 0; 183 return 0;
191} 184}
192 185