git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
net
/
sctp
/
ipv6.c
diff --git
a/net/sctp/ipv6.c
b/net/sctp/ipv6.c
index
af402f7
..
09e6df2
100644
(file)
--- a/
net/sctp/ipv6.c
+++ b/
net/sctp/ipv6.c
@@
-107,7
+107,7
@@
void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
skb->nh.raw = saveip;
skb->h.raw = savesctp;
if (!sk) {
skb->nh.raw = saveip;
skb->h.raw = savesctp;
if (!sk) {
- ICMP6_INC_STATS_BH(idev, I
cmp6InErrors
);
+ ICMP6_INC_STATS_BH(idev, I
CMP6_MIB_INERRORS
);
goto out;
}
goto out;
}
@@
-177,7
+177,7
@@
static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport,
__FUNCTION__, skb, skb->len,
NIP6(fl.fl6_src), NIP6(fl.fl6_dst));
__FUNCTION__, skb, skb->len,
NIP6(fl.fl6_src), NIP6(fl.fl6_dst));
- SCTP_INC_STATS(S
ctpOutSCTPPacks
);
+ SCTP_INC_STATS(S
CTP_MIB_OUTSCTPPACKS
);
return ip6_xmit(sk, skb, &fl, np->opt, ipfragok);
}
return ip6_xmit(sk, skb, &fl, np->opt, ipfragok);
}
@@
-641,7
+641,7
@@
struct sock *sctp_v6_create_accept_sk(struct sock *sk,
#endif
if (newsk->sk_prot->init(newsk)) {
#endif
if (newsk->sk_prot->init(newsk)) {
-
inet_sock
_release(newsk);
+
sk_common
_release(newsk);
newsk = NULL;
}
newsk = NULL;
}
@@
-882,10
+882,10
@@
static struct proto_ops inet6_seqpacket_ops = {
.ioctl = inet6_ioctl,
.listen = sctp_inet_listen,
.shutdown = inet_shutdown,
.ioctl = inet6_ioctl,
.listen = sctp_inet_listen,
.shutdown = inet_shutdown,
- .setsockopt =
inet
_setsockopt,
- .getsockopt =
inet
_getsockopt,
+ .setsockopt =
sock_common
_setsockopt,
+ .getsockopt =
sock_common
_getsockopt,
.sendmsg = inet_sendmsg,
.sendmsg = inet_sendmsg,
- .recvmsg =
inet
_recvmsg,
+ .recvmsg =
sock_common
_recvmsg,
.mmap = sock_no_mmap,
};
.mmap = sock_no_mmap,
};