projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
net
/
ipv4
/
tcp.c
diff --git
a/net/ipv4/tcp.c
b/net/ipv4/tcp.c
index f93150d151995cdeeb297fec25b365c5c68f889a..f9faadb4248552430887a5214b6cdc420c8596fb 100644
(file)
--- a/
net/ipv4/tcp.c
+++ b/
net/ipv4/tcp.c
@@
-938,7
+938,7
@@
new_segment:
i = skb_shinfo(skb)->nr_frags;
can_coalesce = skb_can_coalesce(skb, i, page, offset);
i = skb_shinfo(skb)->nr_frags;
can_coalesce = skb_can_coalesce(skb, i, page, offset);
- if (!can_coalesce && i >=
MAX_SKB_FRAGS
) {
+ if (!can_coalesce && i >=
sysctl_max_skb_frags
) {
tcp_mark_push(tp, skb);
goto new_segment;
}
tcp_mark_push(tp, skb);
goto new_segment;
}
@@
-1211,7
+1211,7
@@
new_segment:
if (!skb_can_coalesce(skb, i, pfrag->page,
pfrag->offset)) {
if (!skb_can_coalesce(skb, i, pfrag->page,
pfrag->offset)) {
- if (i ==
MAX_SKB_FRAGS
|| !sg) {
+ if (i ==
sysctl_max_skb_frags
|| !sg) {
tcp_mark_push(tp, skb);
goto new_segment;
}
tcp_mark_push(tp, skb);
goto new_segment;
}
@@
-2960,7
+2960,7
@@
static void __tcp_alloc_md5sig_pool(void)
struct crypto_hash *hash;
hash = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
struct crypto_hash *hash;
hash = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
- if (IS_ERR
_OR_NULL
(hash))
+ if (IS_ERR(hash))
return;
per_cpu(tcp_md5sig_pool, cpu).md5_desc.tfm = hash;
}
return;
per_cpu(tcp_md5sig_pool, cpu).md5_desc.tfm = hash;
}