diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 02:59:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 02:59:21 -0400 |
| commit | cf206bffbb7542df54043fad9898113172af99d8 (patch) | |
| tree | c7e7ca9a93443b888f98a0c07e74751a1aa3c947 /include/net/sctp/structs.h | |
| parent | c1955a3d4762e7a9bf84035eb3c4886a900f0d15 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into sched/clock
Diffstat (limited to 'include/net/sctp/structs.h')
| -rw-r--r-- | include/net/sctp/structs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 535a18f57a13..ab1c472ea753 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
| @@ -524,8 +524,7 @@ static inline void sctp_ssn_skip(struct sctp_stream *stream, __u16 id, | |||
| 524 | */ | 524 | */ |
| 525 | struct sctp_af { | 525 | struct sctp_af { |
| 526 | int (*sctp_xmit) (struct sk_buff *skb, | 526 | int (*sctp_xmit) (struct sk_buff *skb, |
| 527 | struct sctp_transport *, | 527 | struct sctp_transport *); |
| 528 | int ipfragok); | ||
| 529 | int (*setsockopt) (struct sock *sk, | 528 | int (*setsockopt) (struct sock *sk, |
| 530 | int level, | 529 | int level, |
| 531 | int optname, | 530 | int optname, |