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
nexedi
linux
Commits
7741c391
Commit
7741c391
authored
Dec 09, 2002
by
Sridhar Samudrala
Committed by
Sridhar Samudrala
Dec 09, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SCTP] Fixes for gcc 3.2 compiler issues and warnings.
parent
8ed80a16
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
9 deletions
+17
-9
net/sctp/protocol.c
net/sctp/protocol.c
+2
-2
net/sctp/sm_make_chunk.c
net/sctp/sm_make_chunk.c
+13
-5
net/sctp/sm_statefuns.c
net/sctp/sm_statefuns.c
+2
-2
No files found.
net/sctp/protocol.c
View file @
7741c391
...
@@ -441,12 +441,12 @@ int sctp_register_af(struct sctp_af *af)
...
@@ -441,12 +441,12 @@ int sctp_register_af(struct sctp_af *af)
case
AF_INET
:
case
AF_INET
:
if
(
sctp_af_v4_specific
)
if
(
sctp_af_v4_specific
)
return
0
;
return
0
;
sctp_af_v4_specific
=
sctp_af_v4_specific
=
af
;
sctp_af_v4_specific
=
af
;
break
;
break
;
case
AF_INET6
:
case
AF_INET6
:
if
(
sctp_af_v6_specific
)
if
(
sctp_af_v6_specific
)
return
0
;
return
0
;
sctp_af_v6_specific
=
sctp_af_v6_specific
=
af
;
sctp_af_v6_specific
=
af
;
break
;
break
;
default:
default:
return
0
;
return
0
;
...
...
net/sctp/sm_make_chunk.c
View file @
7741c391
...
@@ -77,13 +77,18 @@ static const sctp_supported_addrs_param_t sat_param = {
...
@@ -77,13 +77,18 @@ static const sctp_supported_addrs_param_t sat_param = {
{
{
SCTP_PARAM_SUPPORTED_ADDRESS_TYPES
,
SCTP_PARAM_SUPPORTED_ADDRESS_TYPES
,
__constant_htons
(
SCTP_SAT_LEN
),
__constant_htons
(
SCTP_SAT_LEN
),
},
{
/* types[] */
SCTP_PARAM_IPV4_ADDRESS
,
SCTP_V6
(
SCTP_PARAM_IPV6_ADDRESS
,)
}
}
};
};
/* gcc 3.2 doesn't allow initialization of zero-length arrays. So the above
* structure is split and the address types array is initialized using a
* fixed length array.
*/
static
const
__u16
sat_addr_types
[
2
]
=
{
SCTP_PARAM_IPV4_ADDRESS
,
SCTP_V6
(
SCTP_PARAM_IPV6_ADDRESS
,)
};
/* RFC 2960 3.3.2 Initiation (INIT) (1)
/* RFC 2960 3.3.2 Initiation (INIT) (1)
*
*
* Note 2: The ECN capable field is reserved for future use of
* Note 2: The ECN capable field is reserved for future use of
...
@@ -214,7 +219,10 @@ sctp_chunk_t *sctp_make_init(const sctp_association_t *asoc,
...
@@ -214,7 +219,10 @@ sctp_chunk_t *sctp_make_init(const sctp_association_t *asoc,
sctp_addto_chunk
(
retval
,
sizeof
(
init
),
&
init
);
sctp_addto_chunk
(
retval
,
sizeof
(
init
),
&
init
);
retval
->
param_hdr
.
v
=
retval
->
param_hdr
.
v
=
sctp_addto_chunk
(
retval
,
addrs_len
,
addrs
.
v
);
sctp_addto_chunk
(
retval
,
addrs_len
,
addrs
.
v
);
sctp_addto_chunk
(
retval
,
SCTP_SAT_LEN
,
&
sat_param
);
sctp_addto_chunk
(
retval
,
sizeof
(
sctp_paramhdr_t
),
&
sat_param
);
sctp_addto_chunk
(
retval
,
sizeof
(
sat_addr_types
),
sat_addr_types
);
sctp_addto_chunk
(
retval
,
sizeof
(
ecap_param
),
&
ecap_param
);
sctp_addto_chunk
(
retval
,
sizeof
(
ecap_param
),
&
ecap_param
);
nodata:
nodata:
...
...
net/sctp/sm_statefuns.c
View file @
7741c391
...
@@ -870,8 +870,8 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const sctp_endpoint_t *ep,
...
@@ -870,8 +870,8 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const sctp_endpoint_t *ep,
/* Check if the timestamp looks valid. */
/* Check if the timestamp looks valid. */
if
(
time_after
(
hbinfo
->
sent_at
,
jiffies
)
||
if
(
time_after
(
hbinfo
->
sent_at
,
jiffies
)
||
time_after
(
jiffies
,
hbinfo
->
sent_at
+
max_interval
))
{
time_after
(
jiffies
,
hbinfo
->
sent_at
+
max_interval
))
{
SCTP_DEBUG_PRINTK
(
"%s: HEARTBEAT ACK with invalid timestamp
SCTP_DEBUG_PRINTK
(
"%s: HEARTBEAT ACK with invalid timestamp
"
received for transport: %p
\n
"
,
"
received for transport: %p
\n
"
,
__FUNCTION__
,
link
);
__FUNCTION__
,
link
);
return
SCTP_DISPOSITION_DISCARD
;
return
SCTP_DISPOSITION_DISCARD
;
}
}
...
...
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