Merge tag 'pwm/for-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[deliverable/linux.git] / net / dccp / input.c

diff --git a/net/dccp/input.c b/net/dccp/input.c
index 3c8ec7d4a34ec3523a041be3b4c1fd8f73541010..3bd14e8853969d8e69f1b67b6eaecd4cf16864e1 100644 (file)
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -537,7 +537,7 @@ static int dccp_rcv_respond_partopen_state_process(struct sock *sk,
        case DCCP_PKT_DATAACK:
        case DCCP_PKT_ACK:
                /*
-                * FIXME: we should be reseting the PARTOPEN (DELACK) timer
+                * FIXME: we should be resetting the PARTOPEN (DELACK) timer
                 * here but only if we haven't used the DELACK timer for
                 * something else, like sending a delayed ack for a TIMESTAMP
                 * echo, etc, for now were not clearing it, sending an extra