diff --git a/[refs] b/[refs] index 428bdb886d0c..ba437ab82dc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4dce2396b329ef6a14b40c5416d6f76005097b0d +refs/heads/master: d18046b3cd989c06d2ad8d615e57c3cf63c63b67 diff --git a/trunk/include/linux/dccp.h b/trunk/include/linux/dccp.h index 010e2d87ed75..d638e85dc501 100644 --- a/trunk/include/linux/dccp.h +++ b/trunk/include/linux/dccp.h @@ -279,8 +279,6 @@ enum dccp_state { DCCP_MAX_STATES }; -#define DCCP_STATE_MASK 0x1f - enum { DCCPF_OPEN = TCPF_ESTABLISHED, DCCPF_REQUESTING = TCPF_SYN_SENT,