diff options
Diffstat (limited to 'net/ipv4/tcp_diag.c')
-rw-r--r-- | net/ipv4/tcp_diag.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c index f5fc84aaa9b4..8bf495c698f8 100644 --- a/net/ipv4/tcp_diag.c +++ b/net/ipv4/tcp_diag.c | |||
@@ -45,7 +45,7 @@ static struct sock *tcpnl; | |||
45 | #define TCPDIAG_PUT(skb, attrtype, attrlen) \ | 45 | #define TCPDIAG_PUT(skb, attrtype, attrlen) \ |
46 | RTA_DATA(__RTA_PUT(skb, attrtype, attrlen)) | 46 | RTA_DATA(__RTA_PUT(skb, attrtype, attrlen)) |
47 | 47 | ||
48 | #if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE) | 48 | #ifdef CONFIG_IP_TCPDIAG_DCCP |
49 | extern struct inet_hashinfo dccp_hashinfo; | 49 | extern struct inet_hashinfo dccp_hashinfo; |
50 | #endif | 50 | #endif |
51 | 51 | ||
@@ -216,7 +216,7 @@ static int tcpdiag_get_exact(struct sk_buff *in_skb, const struct nlmsghdr *nlh) | |||
216 | struct tcpdiagreq *req = NLMSG_DATA(nlh); | 216 | struct tcpdiagreq *req = NLMSG_DATA(nlh); |
217 | struct sk_buff *rep; | 217 | struct sk_buff *rep; |
218 | struct inet_hashinfo *hashinfo = &tcp_hashinfo; | 218 | struct inet_hashinfo *hashinfo = &tcp_hashinfo; |
219 | #if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE) | 219 | #ifdef CONFIG_IP_TCPDIAG_DCCP |
220 | if (nlh->nlmsg_type == DCCPDIAG_GETSOCK) | 220 | if (nlh->nlmsg_type == DCCPDIAG_GETSOCK) |
221 | hashinfo = &dccp_hashinfo; | 221 | hashinfo = &dccp_hashinfo; |
222 | #endif | 222 | #endif |
@@ -614,7 +614,7 @@ static int tcpdiag_dump(struct sk_buff *skb, struct netlink_callback *cb) | |||
614 | s_i = cb->args[1]; | 614 | s_i = cb->args[1]; |
615 | s_num = num = cb->args[2]; | 615 | s_num = num = cb->args[2]; |
616 | hashinfo = &tcp_hashinfo; | 616 | hashinfo = &tcp_hashinfo; |
617 | #if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE) | 617 | #ifdef CONFIG_IP_TCPDIAG_DCCP |
618 | if (cb->nlh->nlmsg_type == DCCPDIAG_GETSOCK) | 618 | if (cb->nlh->nlmsg_type == DCCPDIAG_GETSOCK) |
619 | hashinfo = &dccp_hashinfo; | 619 | hashinfo = &dccp_hashinfo; |
620 | #endif | 620 | #endif |
@@ -752,7 +752,7 @@ tcpdiag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
752 | return 0; | 752 | return 0; |
753 | 753 | ||
754 | if (nlh->nlmsg_type != TCPDIAG_GETSOCK | 754 | if (nlh->nlmsg_type != TCPDIAG_GETSOCK |
755 | #if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE) | 755 | #ifdef CONFIG_IP_TCPDIAG_DCCP |
756 | && nlh->nlmsg_type != DCCPDIAG_GETSOCK | 756 | && nlh->nlmsg_type != DCCPDIAG_GETSOCK |
757 | #endif | 757 | #endif |
758 | ) | 758 | ) |