sctp: only check for ECN if peer is using it
authorMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Wed, 13 Jul 2016 18:09:00 +0000 (15:09 -0300)
committerDavid S. Miller <davem@davemloft.net>
Thu, 14 Jul 2016 01:10:14 +0000 (18:10 -0700)
Currently only read-only checks are performed up to the point on where
we check if peer is ECN capable, checks which we can avoid otherwise.
The flag ecn_ce_done is only used to perform this check once per
incoming packet, and nothing more.

Thus this patch moves the peer check up.

Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/sm_statefuns.c

index b7c1f7f3c8388400e51e3fbdbe099bc354559913..d88bb2b0b69913ad5962f9a5655d413f2c210ed0 100644 (file)
@@ -6118,12 +6118,11 @@ static int sctp_eat_data(const struct sctp_association *asoc,
         * chunk later.
         */
 
-       if (!chunk->ecn_ce_done) {
+       if (asoc->peer.ecn_capable && !chunk->ecn_ce_done) {
                struct sctp_af *af = SCTP_INPUT_CB(chunk->skb)->af;
                chunk->ecn_ce_done = 1;
 
-               if (af->is_ce(sctp_gso_headskb(chunk->skb)) &&
-                   asoc->peer.ecn_capable) {
+               if (af->is_ce(sctp_gso_headskb(chunk->skb))) {
                        /* Do real work as sideffect. */
                        sctp_add_cmd_sf(commands, SCTP_CMD_ECN_CE,
                                        SCTP_U32(tsn));