patch-2.1.16 linux/net/ipv4/tcp_ipv4.c

• Lines: 18
• Date: Wed Dec 18 12:07:55 1996
• Orig file: v2.1.15/linux/net/ipv4/tcp_ipv4.c
• Orig date: Thu Dec 12 19:37:30 1996

diff -u --recursive --new-file v2.1.15/linux/net/ipv4/tcp_ipv4.c linux/net/ipv4/tcp_ipv4.c
@@ -721,7 +721,7 @@
 	struct rtable *rt;
 	int snd_mss;
 
-	newsk = (struct sock *) kmalloc(sizeof(struct sock), GFP_ATOMIC);
+	newsk = sk_alloc(GFP_ATOMIC);
 	if (newsk == NULL)
 	{
 		return NULL;
@@ -1018,7 +1018,7 @@
 
 #ifdef CONFIG_IP_TRANSPARENT_PROXY
 	if (IPCB(skb)->redirport)
-		sk = get_sock_proxy(&tcp_prot, th->dest, saddr, th->source, daddr, dev->pa_addr, IPCB(skb)->redirport);
+		sk = get_sock_proxy(&tcp_prot, th->dest, saddr, th->source, daddr, skb->dev->pa_addr, IPCB(skb)->redirport);
 	else
 #endif
 	sk = get_tcp_sock(saddr, th->source, daddr, th->dest);