aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_ipv4.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r--net/ipv4/tcp_ipv4.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index ad08392a738c..771f8146a2e5 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1286,8 +1286,8 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
1286 goto drop_and_release; 1286 goto drop_and_release;
1287 1287
1288 /* Secret recipe starts with IP addresses */ 1288 /* Secret recipe starts with IP addresses */
1289 *mess++ ^= daddr; 1289 *mess++ ^= (__force u32)daddr;
1290 *mess++ ^= saddr; 1290 *mess++ ^= (__force u32)saddr;
1291 1291
1292 /* plus variable length Initiator Cookie */ 1292 /* plus variable length Initiator Cookie */
1293 c = (u8 *)mess; 1293 c = (u8 *)mess;
@@ -1672,7 +1672,7 @@ process:
1672 1672
1673 skb->dev = NULL; 1673 skb->dev = NULL;
1674 1674
1675 inet_rps_save_rxhash(sk, skb->rxhash); 1675 sock_rps_save_rxhash(sk, skb->rxhash);
1676 1676
1677 bh_lock_sock_nested(sk); 1677 bh_lock_sock_nested(sk);
1678 ret = 0; 1678 ret = 0;