diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-11 13:51:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-11 13:51:59 +0200 |
| commit | 040cca3ab2f6f8b8d26e0e4965abea2b9aa14818 (patch) | |
| tree | 25709ba52ee06fccf4bfbfbf2897bb8cf86da828 /net/ipv4/udp.c | |
| parent | ef0758dd0fd70b98b889af26e27f003656952db8 (diff) | |
| parent | b2dbdf2ca1d2803e9cdc46a94554c4a39ffb235a (diff) | |
| download | linux-040cca3ab2f6f8b8d26e0e4965abea2b9aa14818.tar.bz2 | |
Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
include/linux/mm_types.h
mm/huge_memory.c
I removed the smp_mb__before_spinlock() like the following commit does:
8b1b436dd1cc ("mm, locking: Rework {set,clear,mm}_tlb_flush_pending()")
and fixed up the affected commits.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 3037339ed8b8..b34f09b20fef 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -802,7 +802,7 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4) if (is_udplite) /* UDP-Lite */ csum = udplite_csum(skb); - else if (sk->sk_no_check_tx) { /* UDP csum disabled */ + else if (sk->sk_no_check_tx && !skb_is_gso(skb)) { /* UDP csum off */ skb->ip_summed = CHECKSUM_NONE; goto send; |