/spare/repo/netdev-2.6 branch 'master'
This commit is contained in:
@@ -167,15 +167,12 @@ void sctp_unhash_established(struct sctp_association *);
|
||||
void sctp_hash_endpoint(struct sctp_endpoint *);
|
||||
void sctp_unhash_endpoint(struct sctp_endpoint *);
|
||||
struct sock *sctp_err_lookup(int family, struct sk_buff *,
|
||||
struct sctphdr *, struct sctp_endpoint **,
|
||||
struct sctp_association **,
|
||||
struct sctphdr *, struct sctp_association **,
|
||||
struct sctp_transport **);
|
||||
void sctp_err_finish(struct sock *, struct sctp_endpoint *,
|
||||
struct sctp_association *);
|
||||
void sctp_err_finish(struct sock *, struct sctp_association *);
|
||||
void sctp_icmp_frag_needed(struct sock *, struct sctp_association *,
|
||||
struct sctp_transport *t, __u32 pmtu);
|
||||
void sctp_icmp_proto_unreachable(struct sock *sk,
|
||||
struct sctp_endpoint *ep,
|
||||
struct sctp_association *asoc,
|
||||
struct sctp_transport *t);
|
||||
|
||||
|
||||
@@ -803,7 +803,7 @@ struct xfrm_algo_desc {
|
||||
/* XFRM tunnel handlers. */
|
||||
struct xfrm_tunnel {
|
||||
int (*handler)(struct sk_buff *skb);
|
||||
void (*err_handler)(struct sk_buff *skb, void *info);
|
||||
void (*err_handler)(struct sk_buff *skb, __u32 info);
|
||||
};
|
||||
|
||||
struct xfrm6_tunnel {
|
||||
|
||||
Reference in New Issue
Block a user