3.10-stable review patch. If anyone has any objections, please let me know.
------------------ It turns out that commit: d3f7d56a7a4671d395e8af87071068a195257bf6 was applied to the tree twice, which didn't hurt anything, but it's good to fix this up. Reported-by: Veaceslav Falico <[email protected]> Cc: David S. Miller <[email protected]> Cc: Eric Dumazet <[email protected]> Cc: Richard Weinberger <[email protected]> Cc: Shawn Landden <[email protected]> Cc: Tom Herbert <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- crypto/algif_hash.c | 3 --- crypto/algif_skcipher.c | 3 --- net/ipv4/udp.c | 3 --- 3 files changed, 9 deletions(-) --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -117,9 +117,6 @@ static ssize_t hash_sendpage(struct sock if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; - if (flags & MSG_SENDPAGE_NOTLAST) - flags |= MSG_MORE; - lock_sock(sk); sg_init_table(ctx->sgl.sg, 1); sg_set_page(ctx->sgl.sg, page, size, offset); --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -381,9 +381,6 @@ static ssize_t skcipher_sendpage(struct if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; - if (flags & MSG_SENDPAGE_NOTLAST) - flags |= MSG_MORE; - lock_sock(sk); if (!ctx->more && ctx->used) goto unlock; --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1073,9 +1073,6 @@ int udp_sendpage(struct sock *sk, struct if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; - if (flags & MSG_SENDPAGE_NOTLAST) - flags |= MSG_MORE; - if (!up->pending) { struct msghdr msg = { .msg_flags = flags|MSG_MORE }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
