7 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index d6c0e64ec97f..dace87f06e5f 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -369,7 +369,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
        pip->saddr    = fl4.saddr;
        pip->protocol = IPPROTO_IGMP;
        pip->tot_len  = 0;      /* filled in later */
-        ip_select_ident(pip, &rt->dst, NULL);
+        ip_select_ident(skb, &rt->dst, NULL);
        ((u8 *)&pip[1])[0] = IPOPT_RA;
        ((u8 *)&pip[1])[1] = 4;
        ((u8 *)&pip[1])[2] = 0;
@@ -714,7 +714,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
        iph->daddr    = dst;
        iph->saddr    = fl4.saddr;
        iph->protocol = IPPROTO_IGMP;
-        ip_select_ident(iph, &rt->dst, NULL);
+        ip_select_ident(skb, &rt->dst, NULL);
        ((u8 *)&iph[1])[0] = IPOPT_RA;
        ((u8 *)&iph[1])[1] = 4;
        ((u8 *)&iph[1])[2] = 0;
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
index 000e3d239d64..33d5537881ed 100644
--- a/net/ipv4/inetpeer.c
+++ b/net/ipv4/inetpeer.c
@@ -32,8 +32,8 @@
 *  At the moment of writing this notes identifier of IP packets is generated
 *  to be unpredictable using this code only for packets subjected
 *  (actually or potentially) to defragmentation.  I.e. DF packets less than
- *  PMTU in size uses a constant ID and do not use this code (see
+ *  PMTU in size when local fragmentation is disabled use a constant ID and do
- *  ip_select_ident() in include/net/ip.h).
+ *  not use this code (see ip_select_ident() in include/net/ip.h).
 *
 *  Route cache entries hold references to our nodes.
 *  New cache entries get references via lookup by destination IP address in
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index eae2e262fbe5..a04d872c54f9 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -148,7 +148,7 @@ int ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk,
        iph->daddr    = (opt && opt->opt.srr ? opt->opt.faddr : daddr);
        iph->saddr    = saddr;
        iph->protocol = sk->sk_protocol;
-        ip_select_ident(iph, &rt->dst, sk);
+        ip_select_ident(skb, &rt->dst, sk);
        if (opt && opt->opt.optlen) {
                iph->ihl += opt->opt.optlen>>2;
@@ -386,7 +386,7 @@ packet_routed:
                ip_options_build(skb, &inet_opt->opt, inet->inet_daddr, rt, 0);
        }
-        ip_select_ident_more(iph, &rt->dst, sk,
+        ip_select_ident_more(skb, &rt->dst, sk,
                             (skb_shinfo(skb)->gso_segs ?: 1) - 1);
        skb->priority = sk->sk_priority;
@@ -1324,7 +1324,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk,
        iph->ttl = ttl;
        iph->protocol = sk->sk_protocol;
        ip_copy_addrs(iph, fl4);
-        ip_select_ident(iph, &rt->dst, sk);
+        ip_select_ident(skb, &rt->dst, sk);
        if (opt) {
                iph->ihl += opt->optlen>>2;
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 9ae54b09254f..62212c772a4b 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1658,7 +1658,7 @@ static void ip_encap(struct sk_buff *skb, __be32 saddr, __be32 daddr)
        iph->protocol   =       IPPROTO_IPIP;
        iph->ihl        =       5;
        iph->tot_len    =       htons(skb->len);
-        ip_select_ident(iph, skb_dst(skb), NULL);
+        ip_select_ident(skb, skb_dst(skb), NULL);
        ip_send_check(iph);
        memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index a86c7ae71881..bfec521c717f 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -387,7 +387,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,
                iph->check   = 0;
                iph->tot_len = htons(length);
                if (!iph->id)
-                        ip_select_ident(iph, &rt->dst, NULL);
+                        ip_select_ident(skb, &rt->dst, NULL);
                iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
        }
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c
index eb1dd4d643f2..b5663c37f089 100644
--- a/net/ipv4/xfrm4_mode_tunnel.c
+++ b/net/ipv4/xfrm4_mode_tunnel.c
@@ -117,7 +117,7 @@ static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
        top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ?
                0 : (XFRM_MODE_SKB_CB(skb)->frag_off & htons(IP_DF));
-        ip_select_ident(top_iph, dst->child, NULL);
+        ip_select_ident(skb, dst->child, NULL);
        top_iph->ttl = ip4_dst_hoplimit(dst->child);
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index b75ff6429a04..c47444e4cf8c 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -883,7 +883,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
        iph->daddr              =       cp->daddr.ip;
        iph->saddr              =       saddr;
        iph->ttl                =       old_iph->ttl;
-        ip_select_ident(iph, &rt->dst, NULL);
+        ip_select_ident(skb, &rt->dst, NULL);
        /* Another hack: avoid icmp_send in ip_fragment */
        skb->local_df = 1;

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index d6c0e64ec97f..dace87f06e5f 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c
@@ -369,7 +369,7 @@ static struct sk_buff igmpv3_newpack(struct net_device dev, int size)
369	pip->saddr = fl4.saddr;	369	pip->saddr = fl4.saddr;
370	pip->protocol = IPPROTO_IGMP;	370	pip->protocol = IPPROTO_IGMP;
371	pip->tot_len = 0; /* filled in later */	371	pip->tot_len = 0; /* filled in later */
372	ip_select_ident(pip, &rt->dst, NULL);	372	ip_select_ident(skb, &rt->dst, NULL);
373	((u8 *)&pip[1])[0] = IPOPT_RA;	373	((u8 *)&pip[1])[0] = IPOPT_RA;
374	((u8 *)&pip[1])[1] = 4;	374	((u8 *)&pip[1])[1] = 4;
375	((u8 *)&pip[1])[2] = 0;	375	((u8 *)&pip[1])[2] = 0;
@@ -714,7 +714,7 @@ static int igmp_send_report(struct in_device in_dev, struct ip_mc_list pmc,
714	iph->daddr = dst;	714	iph->daddr = dst;
715	iph->saddr = fl4.saddr;	715	iph->saddr = fl4.saddr;
716	iph->protocol = IPPROTO_IGMP;	716	iph->protocol = IPPROTO_IGMP;
717	ip_select_ident(iph, &rt->dst, NULL);	717	ip_select_ident(skb, &rt->dst, NULL);
718	((u8 *)&iph[1])[0] = IPOPT_RA;	718	((u8 *)&iph[1])[0] = IPOPT_RA;
719	((u8 *)&iph[1])[1] = 4;	719	((u8 *)&iph[1])[1] = 4;
720	((u8 *)&iph[1])[2] = 0;	720	((u8 *)&iph[1])[2] = 0;


diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c index 000e3d239d64..33d5537881ed 100644 --- a/net/ipv4/inetpeer.c +++ b/net/ipv4/inetpeer.c
@@ -32,8 +32,8 @@
32	* At the moment of writing this notes identifier of IP packets is generated	32	* At the moment of writing this notes identifier of IP packets is generated
33	* to be unpredictable using this code only for packets subjected	33	* to be unpredictable using this code only for packets subjected
34	* (actually or potentially) to defragmentation. I.e. DF packets less than	34	* (actually or potentially) to defragmentation. I.e. DF packets less than
35	* PMTU in size uses a constant ID and do not use this code (see	35	* PMTU in size when local fragmentation is disabled use a constant ID and do
36	* ip_select_ident() in include/net/ip.h).	36	* not use this code (see ip_select_ident() in include/net/ip.h).
37	*	37	*
38	* Route cache entries hold references to our nodes.	38	* Route cache entries hold references to our nodes.
39	* New cache entries get references via lookup by destination IP address in	39	* New cache entries get references via lookup by destination IP address in


diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index eae2e262fbe5..a04d872c54f9 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c
@@ -148,7 +148,7 @@ int ip_build_and_send_pkt(struct sk_buff skb, struct sock sk,
148	iph->daddr = (opt && opt->opt.srr ? opt->opt.faddr : daddr);	148	iph->daddr = (opt && opt->opt.srr ? opt->opt.faddr : daddr);
149	iph->saddr = saddr;	149	iph->saddr = saddr;
150	iph->protocol = sk->sk_protocol;	150	iph->protocol = sk->sk_protocol;
151	ip_select_ident(iph, &rt->dst, sk);	151	ip_select_ident(skb, &rt->dst, sk);
152		152
153	if (opt && opt->opt.optlen) {	153	if (opt && opt->opt.optlen) {
154	iph->ihl += opt->opt.optlen>>2;	154	iph->ihl += opt->opt.optlen>>2;
@@ -386,7 +386,7 @@ packet_routed:
386	ip_options_build(skb, &inet_opt->opt, inet->inet_daddr, rt, 0);	386	ip_options_build(skb, &inet_opt->opt, inet->inet_daddr, rt, 0);
387	}	387	}
388		388
389	ip_select_ident_more(iph, &rt->dst, sk,	389	ip_select_ident_more(skb, &rt->dst, sk,
390	(skb_shinfo(skb)->gso_segs ?: 1) - 1);	390	(skb_shinfo(skb)->gso_segs ?: 1) - 1);
391		391
392	skb->priority = sk->sk_priority;	392	skb->priority = sk->sk_priority;
@@ -1324,7 +1324,7 @@ struct sk_buff __ip_make_skb(struct sock sk,
1324	iph->ttl = ttl;	1324	iph->ttl = ttl;
1325	iph->protocol = sk->sk_protocol;	1325	iph->protocol = sk->sk_protocol;
1326	ip_copy_addrs(iph, fl4);	1326	ip_copy_addrs(iph, fl4);
1327	ip_select_ident(iph, &rt->dst, sk);	1327	ip_select_ident(skb, &rt->dst, sk);
1328		1328
1329	if (opt) {	1329	if (opt) {
1330	iph->ihl += opt->optlen>>2;	1330	iph->ihl += opt->optlen>>2;


diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 9ae54b09254f..62212c772a4b 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c
@@ -1658,7 +1658,7 @@ static void ip_encap(struct sk_buff *skb, __be32 saddr, __be32 daddr)
1658	iph->protocol = IPPROTO_IPIP;	1658	iph->protocol = IPPROTO_IPIP;
1659	iph->ihl = 5;	1659	iph->ihl = 5;
1660	iph->tot_len = htons(skb->len);	1660	iph->tot_len = htons(skb->len);
1661	ip_select_ident(iph, skb_dst(skb), NULL);	1661	ip_select_ident(skb, skb_dst(skb), NULL);
1662	ip_send_check(iph);	1662	ip_send_check(iph);
1663		1663
1664	memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));	1664	memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));


diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index a86c7ae71881..bfec521c717f 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c
@@ -387,7 +387,7 @@ static int raw_send_hdrinc(struct sock sk, struct flowi4 fl4,
387	iph->check = 0;	387	iph->check = 0;
388	iph->tot_len = htons(length);	388	iph->tot_len = htons(length);
389	if (!iph->id)	389	if (!iph->id)
390	ip_select_ident(iph, &rt->dst, NULL);	390	ip_select_ident(skb, &rt->dst, NULL);
391		391
392	iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);	392	iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
393	}	393	}


diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c index eb1dd4d643f2..b5663c37f089 100644 --- a/net/ipv4/xfrm4_mode_tunnel.c +++ b/net/ipv4/xfrm4_mode_tunnel.c
@@ -117,7 +117,7 @@ static int xfrm4_mode_tunnel_output(struct xfrm_state x, struct sk_buff skb)
117		117
118	top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ?	118	top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ?
119	0 : (XFRM_MODE_SKB_CB(skb)->frag_off & htons(IP_DF));	119	0 : (XFRM_MODE_SKB_CB(skb)->frag_off & htons(IP_DF));
120	ip_select_ident(top_iph, dst->child, NULL);	120	ip_select_ident(skb, dst->child, NULL);
121		121
122	top_iph->ttl = ip4_dst_hoplimit(dst->child);	122	top_iph->ttl = ip4_dst_hoplimit(dst->child);
123		123


diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c index b75ff6429a04..c47444e4cf8c 100644 --- a/net/netfilter/ipvs/ip_vs_xmit.c +++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -883,7 +883,7 @@ ip_vs_tunnel_xmit(struct sk_buff skb, struct ip_vs_conn cp,
883	iph->daddr = cp->daddr.ip;	883	iph->daddr = cp->daddr.ip;
884	iph->saddr = saddr;	884	iph->saddr = saddr;
885	iph->ttl = old_iph->ttl;	885	iph->ttl = old_iph->ttl;
886	ip_select_ident(iph, &rt->dst, NULL);	886	ip_select_ident(skb, &rt->dst, NULL);
887		887
888	/* Another hack: avoid icmp_send in ip_fragment */	888	/* Another hack: avoid icmp_send in ip_fragment */
889	skb->local_df = 1;	889	skb->local_df = 1;