aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/proto.c
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
committerJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
commit8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
treea8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /net/dccp/proto.c
parent406089d01562f1e2bf9f089fd7637009ebaad589 (diff)
Patched in Tegra support.
Diffstat (limited to 'net/dccp/proto.c')
-rw-r--r--net/dccp/proto.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 6c7c78b8394..152975d942d 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -184,6 +184,7 @@ int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized)
184 dp->dccps_rate_last = jiffies; 184 dp->dccps_rate_last = jiffies;
185 dp->dccps_role = DCCP_ROLE_UNDEFINED; 185 dp->dccps_role = DCCP_ROLE_UNDEFINED;
186 dp->dccps_service = DCCP_SERVICE_CODE_IS_ABSENT; 186 dp->dccps_service = DCCP_SERVICE_CODE_IS_ABSENT;
187 dp->dccps_l_ack_ratio = dp->dccps_r_ack_ratio = 1;
187 dp->dccps_tx_qlen = sysctl_dccp_tx_qlen; 188 dp->dccps_tx_qlen = sysctl_dccp_tx_qlen;
188 189
189 dccp_init_xmit_timers(sk); 190 dccp_init_xmit_timers(sk);
@@ -848,7 +849,7 @@ int dccp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
848 default: 849 default:
849 dccp_pr_debug("packet_type=%s\n", 850 dccp_pr_debug("packet_type=%s\n",
850 dccp_packet_name(dh->dccph_type)); 851 dccp_packet_name(dh->dccph_type));
851 sk_eat_skb(sk, skb, false); 852 sk_eat_skb(sk, skb, 0);
852 } 853 }
853verify_sock_status: 854verify_sock_status:
854 if (sock_flag(sk, SOCK_DONE)) { 855 if (sock_flag(sk, SOCK_DONE)) {
@@ -905,7 +906,7 @@ verify_sock_status:
905 len = skb->len; 906 len = skb->len;
906 found_fin_ok: 907 found_fin_ok:
907 if (!(flags & MSG_PEEK)) 908 if (!(flags & MSG_PEEK))
908 sk_eat_skb(sk, skb, false); 909 sk_eat_skb(sk, skb, 0);
909 break; 910 break;
910 } while (1); 911 } while (1);
911out: 912out:
@@ -1099,7 +1100,7 @@ module_param(thash_entries, int, 0444);
1099MODULE_PARM_DESC(thash_entries, "Number of ehash buckets"); 1100MODULE_PARM_DESC(thash_entries, "Number of ehash buckets");
1100 1101
1101#ifdef CONFIG_IP_DCCP_DEBUG 1102#ifdef CONFIG_IP_DCCP_DEBUG
1102bool dccp_debug; 1103int dccp_debug;
1103module_param(dccp_debug, bool, 0644); 1104module_param(dccp_debug, bool, 0644);
1104MODULE_PARM_DESC(dccp_debug, "Enable debug messages"); 1105MODULE_PARM_DESC(dccp_debug, "Enable debug messages");
1105 1106