summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-31 00:52:22 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-31 00:52:22 -0700
commit0ee13079906f0e0b185b13a1fbdaf24d853baa8d (patch)
treef9f81bc64f623c59fe8f806a131e5866c570b762 /include
parent2d8348b429b4ae5cc47449c787881221fe43af4b (diff)
parent88282c6ecf0dacefda6090b0289d35e8a3cc6221 (diff)
downloadop-kernel-dev-0ee13079906f0e0b185b13a1fbdaf24d853baa8d.zip
op-kernel-dev-0ee13079906f0e0b185b13a1fbdaf24d853baa8d.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [PKTGEN]: Remove write-only variable. [NETFILTER]: xt_tcpudp: fix wrong struct in udp_checkentry [NET_SCHED] sch_prio.c: remove duplicate call of tc_classify() [BRIDGE]: Fix OOPS when bridging device without ethtool. [BRIDGE]: Packets leaking out of disabled/blocked ports. [TCP]: Allow minimum RTO to be configurable via routing metrics. SCTP: Fix to handle invalid parameter length correctly SCTP: Abort on COOKIE-ECHO if backlog is exceeded. SCTP: Correctly disable listening when backlog is 0. SCTP: Do not retransmit chunks that are newer then rtt. SCTP: Uncomfirmed transports can't become Inactive SCTP: Pick the correct port when binding to 0. SCTP: Use net_ratelimit to suppress error messages print too fast SCTP: Fix to encode PROTOCOL VIOLATION error cause correctly SCTP: Fix sctp_addto_chunk() to add pad with correct length SCTP: Assign stream sequence numbers to the entire message SCTP: properly clean up fragment and ordering queues during FWD-TSN. [PKTGEN]: Fix multiqueue oops. [BNX2]: Add write posting comment. [BNX2]: Use msleep().
Diffstat (limited to 'include')
-rw-r--r--include/linux/rtnetlink.h2
-rw-r--r--include/net/sctp/sm.h2
-rw-r--r--include/net/sctp/structs.h1
-rw-r--r--include/net/sctp/ulpqueue.h1
4 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index c91476c..dff3192 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -351,6 +351,8 @@ enum
#define RTAX_INITCWND RTAX_INITCWND
RTAX_FEATURES,
#define RTAX_FEATURES RTAX_FEATURES
+ RTAX_RTO_MIN,
+#define RTAX_RTO_MIN RTAX_RTO_MIN
__RTAX_MAX
};
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
index 73cb994..991c85b 100644
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -214,7 +214,7 @@ struct sctp_chunk *sctp_make_shutdown_ack(const struct sctp_association *asoc,
const struct sctp_chunk *);
struct sctp_chunk *sctp_make_shutdown_complete(const struct sctp_association *,
const struct sctp_chunk *);
-void sctp_init_cause(struct sctp_chunk *, __be16 cause, const void *, size_t);
+void sctp_init_cause(struct sctp_chunk *, __be16 cause, size_t);
struct sctp_chunk *sctp_make_abort(const struct sctp_association *,
const struct sctp_chunk *,
const size_t hint);
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index ee4559b..c0d5848 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -726,6 +726,7 @@ int sctp_user_addto_chunk(struct sctp_chunk *chunk, int off, int len,
struct iovec *data);
void sctp_chunk_free(struct sctp_chunk *);
void *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data);
+void *sctp_addto_param(struct sctp_chunk *, int len, const void *data);
struct sctp_chunk *sctp_chunkify(struct sk_buff *,
const struct sctp_association *,
struct sock *);
diff --git a/include/net/sctp/ulpqueue.h b/include/net/sctp/ulpqueue.h
index 39ea3f4..cd33270 100644
--- a/include/net/sctp/ulpqueue.h
+++ b/include/net/sctp/ulpqueue.h
@@ -83,6 +83,7 @@ int sctp_clear_pd(struct sock *sk, struct sctp_association *asoc);
/* Skip over an SSN. */
void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn);
+void sctp_ulpq_reasm_flushtsn(struct sctp_ulpq *, __u32);
#endif /* __sctp_ulpqueue_h__ */
OpenPOWER on IntegriCloud