[PATCH 0/2] IPv6 Fix 2 small issues with UFO restoration code

[PATCH 0/2] IPv6 Fix 2 small issues with UFO restoration code

[Vladislav Yasevich]

This series fixes 2 small issues introduced by the
"Restore UFO support to virtio_net devices" series.

Thanks.

Vladislav Yasevich (2):
  ipv6: Resolve sparce error with fragment id selection
  ipv6: Make __ipv6_select_ident static

 include/net/ipv6.h     | 2 --
 net/ipv6/output_core.c | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

-- 
1.9.3

[PATCH 1/2] ipv6: Resolve sparce error with fragment id selection

[Vladislav Yasevich]

Resolve the following sparce error:
 net/ipv6/output_core.c:57:38: sparse: incorrect type in assignment
 (different base types)
   net/ipv6/output_core.c:57:38:    expected restricted __be32
[usertype] ip6_frag_id
   net/ipv6/output_core.c:57:38:    got unsigned int [unsigned]
[assigned] [usertype] id

Fixes: 0508c07f5e0c9 (ipv6: Select fragment id during UFO segmentation
if not set.)
Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com>
---
 net/ipv6/output_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
index 54520a0..a86cf60 100644
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@ -54,7 +54,7 @@ void ipv6_proxy_select_ident(struct sk_buff *skb)
 
 	id = __ipv6_select_ident(ip6_proxy_idents_hashrnd,
 				 &addrs[1], &addrs[0]);
-	skb_shinfo(skb)->ip6_frag_id = id;
+	skb_shinfo(skb)->ip6_frag_id = htonl(id);
 }
 EXPORT_SYMBOL_GPL(ipv6_proxy_select_ident);
 
-- 
1.9.3

Re: [PATCH 1/2] ipv6: Resolve sparce error with fragment id selection

[Eric Dumazet]

On Thu, 2015-02-05 at 09:41 -0500, Vladislav Yasevich wrote:
> Resolve the following sparce error:
>  net/ipv6/output_core.c:57:38: sparse: incorrect type in assignment
>  (different base types)
>    net/ipv6/output_core.c:57:38:    expected restricted __be32
> [usertype] ip6_frag_id
>    net/ipv6/output_core.c:57:38:    got unsigned int [unsigned]
> [assigned] [usertype] id
> 

patch title is misleading.

Lot of 'sparse bugs' are about not using proper types, but here
a bug on little endian arches is fixed.

sparse helped to detect the bug.

> Fixes: 0508c07f5e0c9 (ipv6: Select fragment id during UFO segmentation
> if not set.)

Please do not wrap this line

> Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com>
> ---
>  net/ipv6/output_core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
> index 54520a0..a86cf60 100644
> --- a/net/ipv6/output_core.c
> +++ b/net/ipv6/output_core.c
> @@ -54,7 +54,7 @@ void ipv6_proxy_select_ident(struct sk_buff *skb)
>  
>  	id = __ipv6_select_ident(ip6_proxy_idents_hashrnd,
>  				 &addrs[1], &addrs[0]);
> -	skb_shinfo(skb)->ip6_frag_id = id;
> +	skb_shinfo(skb)->ip6_frag_id = htonl(id);
>  }
>  EXPORT_SYMBOL_GPL(ipv6_proxy_select_ident);
>  

[PATCH 2/2] ipv6: Make __ipv6_select_ident static

[Vladislav Yasevich]

Make __ipv6_select_ident() static as it isn't used outside
the file.

Fixes: 0508c07f5e0c9 (ipv6: Select fragment id during UFO segmentation if not set.)
Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com>
---
 include/net/ipv6.h     | 2 --
 net/ipv6/output_core.c | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 6e416f6..fde3b59 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -671,8 +671,6 @@ static inline int ipv6_addr_diff(const struct in6_addr *a1, const struct in6_add
 	return __ipv6_addr_diff(a1, a2, sizeof(struct in6_addr));
 }
 
-u32 __ipv6_select_ident(u32 hashrnd, struct in6_addr *dst,
-			struct in6_addr *src);
 void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt);
 void ipv6_proxy_select_ident(struct sk_buff *skb);
 
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
index a86cf60..74581f7 100644
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@ -9,7 +9,8 @@
 #include <net/addrconf.h>
 #include <net/secure_seq.h>
 
-u32 __ipv6_select_ident(u32 hashrnd, struct in6_addr *dst, struct in6_addr *src)
+static u32 __ipv6_select_ident(u32 hashrnd, struct in6_addr *dst,
+			       struct in6_addr *src)
 {
 	u32 hash, id;
 
-- 
1.9.3