projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[DCCP]: Uninline some functions
[powerpc.git]
/
net
/
dccp
/
ipv6.c
diff --git
a/net/dccp/ipv6.c
b/net/dccp/ipv6.c
index
df07425
..
904967b
100644
(file)
--- a/
net/dccp/ipv6.c
+++ b/
net/dccp/ipv6.c
@@
-53,7
+53,7
@@
static void dccp_v6_hash(struct sock *sk)
{
if (sk->sk_state != DCCP_CLOSED) {
if (inet_csk(sk)->icsk_af_ops == &dccp_ipv6_mapped) {
{
if (sk->sk_state != DCCP_CLOSED) {
if (inet_csk(sk)->icsk_af_ops == &dccp_ipv6_mapped) {
- dccp_
prot.
hash(sk);
+ dccp_hash(sk);
return;
}
local_bh_disable();
return;
}
local_bh_disable();
@@
-264,7
+264,7
@@
failure:
}
static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
}
static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
- int type, int code, int offset, __
u
32 info)
+ int type, int code, int offset, __
be
32 info)
{
struct ipv6hdr *hdr = (struct ipv6hdr *)skb->data;
const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset);
{
struct ipv6hdr *hdr = (struct ipv6hdr *)skb->data;
const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset);
@@
-468,6
+468,7
@@
static int dccp_v6_send_response(struct sock *sk, struct request_sock *req,
done:
if (opt && opt != np->opt)
sock_kfree_s(sk, opt, opt->tot_len);
done:
if (opt && opt != np->opt)
sock_kfree_s(sk, opt, opt->tot_len);
+ dst_release(dst);
return err;
}
return err;
}
@@
-677,7
+678,7
@@
static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
struct dccp_request_sock *dreq;
struct inet6_request_sock *ireq6;
struct ipv6_pinfo *np = inet6_sk(sk);
struct dccp_request_sock *dreq;
struct inet6_request_sock *ireq6;
struct ipv6_pinfo *np = inet6_sk(sk);
- const __
u
32 service = dccp_hdr_request(skb)->dccph_req_service;
+ const __
be
32 service = dccp_hdr_request(skb)->dccph_req_service;
struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
__u8 reset_code = DCCP_RESET_CODE_TOO_BUSY;
struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
__u8 reset_code = DCCP_RESET_CODE_TOO_BUSY;
@@
-1145,7
+1146,7
@@
static struct inet_connection_sock_af_ops dccp_ipv6_mapped = {
*/
static int dccp_v6_init_sock(struct sock *sk)
{
*/
static int dccp_v6_init_sock(struct sock *sk)
{
- int err = dccp_
v4_
init_sock(sk);
+ int err = dccp_init_sock(sk);
if (err == 0)
inet_csk(sk)->icsk_af_ops = &dccp_ipv6_af_ops;
if (err == 0)
inet_csk(sk)->icsk_af_ops = &dccp_ipv6_af_ops;
@@
-1155,7
+1156,7
@@
static int dccp_v6_init_sock(struct sock *sk)
static int dccp_v6_destroy_sock(struct sock *sk)
{
static int dccp_v6_destroy_sock(struct sock *sk)
{
- dccp_
v4_
destroy_sock(sk);
+ dccp_destroy_sock(sk);
return inet6_destroy_sock(sk);
}
return inet6_destroy_sock(sk);
}