From: David S. Miller <davem@davemloft.net>
Date: Tue, 14 Apr 2015 19:44:14 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=87ffabb1f055e14e7d171c6599539a154d647904;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge git://git./linux/kernel/git/davem/net

The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

87ffabb1f055e14e7d171c6599539a154d647904
diff --cc net/ipv4/tcp_output.c
index e662d85d1635,d520492ba698..8c8d7e06b72f
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@@ -2988,12 -2923,14 +2988,14 @@@ struct sk_buff *tcp_make_synack(struct 
  
  #ifdef CONFIG_TCP_MD5SIG
  	/* Okay, we have all we need - do the md5 hash if needed */
 -	if (md5) {
 +	if (md5)
  		tcp_rsk(req)->af_specific->calc_md5_hash(opts.hash_location,
 -					       md5, NULL, req, skb);
 -	}
 +					       md5, req_to_sk(req), skb);
 +	rcu_read_unlock();
  #endif
  
+ 	/* Do not fool tcpdump (if any), clean our debris */
+ 	skb->tstamp.tv64 = 0;
  	return skb;
  }
  EXPORT_SYMBOL(tcp_make_synack);