Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
da423dfd
Commit
da423dfd
authored
Jul 24, 2004
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SCTP]: Fix mis-merge.
parent
4c28ae20
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
4 deletions
+18
-4
net/sctp/sm_statefuns.c
net/sctp/sm_statefuns.c
+18
-4
No files found.
net/sctp/sm_statefuns.c
View file @
da423dfd
...
@@ -2458,6 +2458,20 @@ sctp_disposition_t sctp_sf_eat_data_fast_4_4(const struct sctp_endpoint *ep,
...
@@ -2458,6 +2458,20 @@ sctp_disposition_t sctp_sf_eat_data_fast_4_4(const struct sctp_endpoint *ep,
return
sctp_sf_pdiscard
(
ep
,
asoc
,
type
,
arg
,
commands
);
return
sctp_sf_pdiscard
(
ep
,
asoc
,
type
,
arg
,
commands
);
}
}
error
=
sctp_eat_data
(
asoc
,
chunk
,
commands
);
switch
(
error
)
{
case
SCTP_IERROR_NO_ERROR
:
case
SCTP_IERROR_HIGH_TSN
:
case
SCTP_IERROR_DUP_TSN
:
case
SCTP_IERROR_IGNORE_TSN
:
case
SCTP_IERROR_BAD_STREAM
:
break
;
case
SCTP_IERROR_NO_DATA
:
goto
consume
;
default:
BUG
();
}
/* Go a head and force a SACK, since we are shutting down. */
/* Go a head and force a SACK, since we are shutting down. */
/* Implementor's Guide.
/* Implementor's Guide.
...
@@ -4741,8 +4755,8 @@ int sctp_eat_data(const struct sctp_association *asoc,
...
@@ -4741,8 +4755,8 @@ int sctp_eat_data(const struct sctp_association *asoc,
sctp_add_cmd_sf
(
commands
,
SCTP_CMD_DISCARD_PACKET
,
SCTP_NULL
());
sctp_add_cmd_sf
(
commands
,
SCTP_CMD_DISCARD_PACKET
,
SCTP_NULL
());
sctp_add_cmd_sf
(
commands
,
SCTP_CMD_ASSOC_FAILED
,
sctp_add_cmd_sf
(
commands
,
SCTP_CMD_ASSOC_FAILED
,
SCTP_U32
(
SCTP_ERROR_NO_DATA
));
SCTP_U32
(
SCTP_ERROR_NO_DATA
));
SCTP_INC_STATS
(
S
ctpAborteds
);
SCTP_INC_STATS
(
S
CTP_MIB_ABORTEDS
);
SCTP_DEC_STATS
(
S
ctpCurrEstab
);
SCTP_DEC_STATS
(
S
CTP_MIB_CURRESTAB
);
return
SCTP_IERROR_NO_DATA
;
return
SCTP_IERROR_NO_DATA
;
}
}
...
@@ -4756,9 +4770,9 @@ int sctp_eat_data(const struct sctp_association *asoc,
...
@@ -4756,9 +4770,9 @@ int sctp_eat_data(const struct sctp_association *asoc,
* if we renege and the chunk arrives again.
* if we renege and the chunk arrives again.
*/
*/
if
(
chunk
->
chunk_hdr
->
flags
&
SCTP_DATA_UNORDERED
)
if
(
chunk
->
chunk_hdr
->
flags
&
SCTP_DATA_UNORDERED
)
SCTP_INC_STATS
(
S
ctpInUnorderChunks
);
SCTP_INC_STATS
(
S
CTP_MIB_INUNORDERCHUNKS
);
else
else
SCTP_INC_STATS
(
S
ctpInOrderChunks
);
SCTP_INC_STATS
(
S
CTP_MIB_INORDERCHUNKS
);
/* RFC 2960 6.5 Stream Identifier and Stream Sequence Number
/* RFC 2960 6.5 Stream Identifier and Stream Sequence Number
*
*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment