Since the new parameter block is initialised to 0 by kzmalloc we don't
need to mask & clear unused operational mode bits, they are already
unset.

Drop the pointless code.

Signed-off-by: Kevin Darbyshire-Bryant <l...@darbyshire-bryant.me.uk>
---
 net/sched/act_ctinfo.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/net/sched/act_ctinfo.c b/net/sched/act_ctinfo.c
index 926109139a81..e78b60e47c0f 100644
--- a/net/sched/act_ctinfo.c
+++ b/net/sched/act_ctinfo.c
@@ -231,16 +231,12 @@ static int tcf_ctinfo_init(struct net *net, struct nlattr 
*nla,
                cp_new->dscpmaskshift = dscpmaskshift;
                cp_new->dscpstatemask = dscpstatemask;
                cp_new->mode |= CTINFO_MODE_DSCP;
-       } else {
-               cp_new->mode &= ~CTINFO_MODE_DSCP;
        }
 
        if (tb[TCA_CTINFO_PARMS_CPMARK_MASK]) {
                cp_new->cpmarkmask =
                                nla_get_u32(tb[TCA_CTINFO_PARMS_CPMARK_MASK]);
                cp_new->mode |= CTINFO_MODE_CPMARK;
-       } else {
-               cp_new->mode &= ~CTINFO_MODE_CPMARK;
        }
 
        spin_lock_bh(&ci->tcf_lock);
-- 
2.20.1 (Apple Git-117)

Reply via email to