* [PATCH v2 0/2] IPv6 Fix 2 small issues with UFO restoration code @ 2015-02-09 14:38 Vladislav Yasevich 2015-02-09 14:38 ` [PATCH v2 1/2] ipv6: Fix fragment id assignment on LE arches Vladislav Yasevich ` (2 more replies) 0 siblings, 3 replies; 4+ messages in thread From: Vladislav Yasevich @ 2015-02-09 14:38 UTC (permalink / raw) To: netdev; +Cc: eric.dumazet, Vladislav Yasevich This series fixes 2 small issues introduced by the "Restore UFO support to virtio_net devices" series. Thanks. V2: Fixed patch title and description for patch1. 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/2] ipv6: Fix fragment id assignment on LE arches. 2015-02-09 14:38 [PATCH v2 0/2] IPv6 Fix 2 small issues with UFO restoration code Vladislav Yasevich @ 2015-02-09 14:38 ` Vladislav Yasevich 2015-02-09 14:38 ` [PATCH v2 2/2] ipv6: Make __ipv6_select_ident static Vladislav Yasevich 2015-02-09 22:27 ` [PATCH v2 0/2] IPv6 Fix 2 small issues with UFO restoration code David Miller 2 siblings, 0 replies; 4+ messages in thread From: Vladislav Yasevich @ 2015-02-09 14:38 UTC (permalink / raw) To: netdev; +Cc: eric.dumazet, Vladislav Yasevich Recent commit: 0508c07f5e0c94f38afd5434e8b2a55b84553077 Author: Vlad Yasevich <vyasevich@gmail.com> Date: Tue Feb 3 16:36:15 2015 -0500 ipv6: Select fragment id during UFO segmentation if not set. Introduced a bug on LE in how ipv6 fragment id is assigned. This was cought by nightly sparce check: 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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] ipv6: Make __ipv6_select_ident static 2015-02-09 14:38 [PATCH v2 0/2] IPv6 Fix 2 small issues with UFO restoration code Vladislav Yasevich 2015-02-09 14:38 ` [PATCH v2 1/2] ipv6: Fix fragment id assignment on LE arches Vladislav Yasevich @ 2015-02-09 14:38 ` Vladislav Yasevich 2015-02-09 22:27 ` [PATCH v2 0/2] IPv6 Fix 2 small issues with UFO restoration code David Miller 2 siblings, 0 replies; 4+ messages in thread From: Vladislav Yasevich @ 2015-02-09 14:38 UTC (permalink / raw) To: netdev; +Cc: eric.dumazet, 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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 0/2] IPv6 Fix 2 small issues with UFO restoration code 2015-02-09 14:38 [PATCH v2 0/2] IPv6 Fix 2 small issues with UFO restoration code Vladislav Yasevich 2015-02-09 14:38 ` [PATCH v2 1/2] ipv6: Fix fragment id assignment on LE arches Vladislav Yasevich 2015-02-09 14:38 ` [PATCH v2 2/2] ipv6: Make __ipv6_select_ident static Vladislav Yasevich @ 2015-02-09 22:27 ` David Miller 2 siblings, 0 replies; 4+ messages in thread From: David Miller @ 2015-02-09 22:27 UTC (permalink / raw) To: vyasevich; +Cc: netdev, eric.dumazet, vyasevic From: Vladislav Yasevich <vyasevich@gmail.com> Date: Mon, 9 Feb 2015 09:38:19 -0500 > This series fixes 2 small issues introduced by the > "Restore UFO support to virtio_net devices" series. ... > V2: Fixed patch title and description for patch1. Series applied, thanks. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-02-09 22:27 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-02-09 14:38 [PATCH v2 0/2] IPv6 Fix 2 small issues with UFO restoration code Vladislav Yasevich 2015-02-09 14:38 ` [PATCH v2 1/2] ipv6: Fix fragment id assignment on LE arches Vladislav Yasevich 2015-02-09 14:38 ` [PATCH v2 2/2] ipv6: Make __ipv6_select_ident static Vladislav Yasevich 2015-02-09 22:27 ` [PATCH v2 0/2] IPv6 Fix 2 small issues with UFO restoration code David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).