* [PATCH v2 1/3] vxlan: silence one build warning
@ 2013-10-28 6:01 Zhi Yong Wu
2013-10-28 6:01 ` [PATCH v2 2/3] net, datagram: fix the incorrect comment in zerocopy_sg_from_iovec() Zhi Yong Wu
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Zhi Yong Wu @ 2013-10-28 6:01 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel, stephen, davem, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
drivers/net/vxlan.c: In function ‘vxlan_sock_add’:
drivers/net/vxlan.c:2298:11: warning: ‘sock’ may be used uninitialized in this function [-Wmaybe-uninitialized]
drivers/net/vxlan.c:2275:17: note: ‘sock’ was declared here
LD drivers/net/built-in.o
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
drivers/net/vxlan.c | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 2ef5b62..019e1f4 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -2180,7 +2180,7 @@ static void vxlan_del_work(struct work_struct *work)
* could be used for both IPv4 and IPv6 communications, but
* users may set bindv6only=1.
*/
-static int create_v6_sock(struct net *net, __be16 port, struct socket **psock)
+static struct socket *create_v6_sock(struct net *net, __be16 port)
{
struct sock *sk;
struct socket *sock;
@@ -2193,7 +2193,7 @@ static int create_v6_sock(struct net *net, __be16 port, struct socket **psock)
rc = sock_create_kern(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, &sock);
if (rc < 0) {
pr_debug("UDPv6 socket create failed\n");
- return rc;
+ return ERR_PTR(rc);
}
/* Put in proper namespace */
@@ -2208,28 +2208,27 @@ static int create_v6_sock(struct net *net, __be16 port, struct socket **psock)
pr_debug("bind for UDPv6 socket %pI6:%u (%d)\n",
&vxlan_addr.sin6_addr, ntohs(vxlan_addr.sin6_port), rc);
sk_release_kernel(sk);
- return rc;
+ return ERR_PTR(rc);
}
/* At this point, IPv6 module should have been loaded in
* sock_create_kern().
*/
BUG_ON(!ipv6_stub);
- *psock = sock;
/* Disable multicast loopback */
inet_sk(sk)->mc_loop = 0;
- return 0;
+ return sock;
}
#else
-static int create_v6_sock(struct net *net, __be16 port, struct socket **psock)
+static struct socket *create_v6_sock(struct net *net, __be16 port)
{
- return -EPFNOSUPPORT;
+ return ERR_PTR(-EPFNOSUPPORT);
}
#endif
-static int create_v4_sock(struct net *net, __be16 port, struct socket **psock)
+static struct socket *create_v4_sock(struct net *net, __be16 port)
{
struct sock *sk;
struct socket *sock;
@@ -2244,7 +2243,7 @@ static int create_v4_sock(struct net *net, __be16 port, struct socket **psock)
rc = sock_create_kern(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock);
if (rc < 0) {
pr_debug("UDP socket create failed\n");
- return rc;
+ return ERR_PTR(rc);
}
/* Put in proper namespace */
@@ -2257,13 +2256,12 @@ static int create_v4_sock(struct net *net, __be16 port, struct socket **psock)
pr_debug("bind for UDP socket %pI4:%u (%d)\n",
&vxlan_addr.sin_addr, ntohs(vxlan_addr.sin_port), rc);
sk_release_kernel(sk);
- return rc;
+ return ERR_PTR(rc);
}
- *psock = sock;
/* Disable multicast loopback */
inet_sk(sk)->mc_loop = 0;
- return 0;
+ return sock;
}
/* Create new listen socket if needed */
@@ -2274,7 +2272,6 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port,
struct vxlan_sock *vs;
struct socket *sock;
struct sock *sk;
- int rc = 0;
unsigned int h;
vs = kmalloc(sizeof(*vs), GFP_KERNEL);
@@ -2287,12 +2284,12 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port,
INIT_WORK(&vs->del_work, vxlan_del_work);
if (ipv6)
- rc = create_v6_sock(net, port, &sock);
+ sock = create_v6_sock(net, port);
else
- rc = create_v4_sock(net, port, &sock);
- if (rc < 0) {
+ sock = create_v4_sock(net, port);
+ if (IS_ERR(sock)) {
kfree(vs);
- return ERR_PTR(rc);
+ return ERR_PTR(PTR_ERR(sock));
}
vs->sock = sock;
--
1.7.11.7
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/3] net, datagram: fix the incorrect comment in zerocopy_sg_from_iovec()
2013-10-28 6:01 [PATCH v2 1/3] vxlan: silence one build warning Zhi Yong Wu
@ 2013-10-28 6:01 ` Zhi Yong Wu
2013-10-29 4:19 ` David Miller
2013-10-28 6:01 ` [PATCH v2 3/3] net, iovec: fix the incorrect comment in memcpy_fromiovecend() Zhi Yong Wu
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Zhi Yong Wu @ 2013-10-28 6:01 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel, stephen, davem, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
net/core/datagram.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/datagram.c b/net/core/datagram.c
index af814e7..a16ed7b 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -577,7 +577,7 @@ EXPORT_SYMBOL(skb_copy_datagram_from_iovec);
/**
* zerocopy_sg_from_iovec - Build a zerocopy datagram from an iovec
* @skb: buffer to copy
- * @from: io vector to copy to
+ * @from: io vector to copy from
* @offset: offset in the io vector to start copying from
* @count: amount of vectors to copy to buffer from
*
--
1.7.11.7
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 3/3] net, iovec: fix the incorrect comment in memcpy_fromiovecend()
2013-10-28 6:01 [PATCH v2 1/3] vxlan: silence one build warning Zhi Yong Wu
2013-10-28 6:01 ` [PATCH v2 2/3] net, datagram: fix the incorrect comment in zerocopy_sg_from_iovec() Zhi Yong Wu
@ 2013-10-28 6:01 ` Zhi Yong Wu
2013-10-29 4:19 ` David Miller
2013-10-28 15:24 ` [PATCH v2 1/3] vxlan: silence one build warning Stephen Hemminger
2013-10-29 4:19 ` David Miller
3 siblings, 1 reply; 7+ messages in thread
From: Zhi Yong Wu @ 2013-10-28 6:01 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel, stephen, davem, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
net/core/iovec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/iovec.c b/net/core/iovec.c
index b77eeec..4cdb7c4 100644
--- a/net/core/iovec.c
+++ b/net/core/iovec.c
@@ -100,7 +100,7 @@ int memcpy_toiovecend(const struct iovec *iov, unsigned char *kdata,
EXPORT_SYMBOL(memcpy_toiovecend);
/*
- * Copy iovec from kernel. Returns -EFAULT on error.
+ * Copy iovec to kernel. Returns -EFAULT on error.
*/
int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov,
--
1.7.11.7
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/3] vxlan: silence one build warning
2013-10-28 6:01 [PATCH v2 1/3] vxlan: silence one build warning Zhi Yong Wu
2013-10-28 6:01 ` [PATCH v2 2/3] net, datagram: fix the incorrect comment in zerocopy_sg_from_iovec() Zhi Yong Wu
2013-10-28 6:01 ` [PATCH v2 3/3] net, iovec: fix the incorrect comment in memcpy_fromiovecend() Zhi Yong Wu
@ 2013-10-28 15:24 ` Stephen Hemminger
2013-10-29 4:19 ` David Miller
3 siblings, 0 replies; 7+ messages in thread
From: Stephen Hemminger @ 2013-10-28 15:24 UTC (permalink / raw)
To: Zhi Yong Wu; +Cc: netdev, linux-kernel, davem, Zhi Yong Wu
On Mon, 28 Oct 2013 14:01:48 +0800
Zhi Yong Wu <zwu.kernel@gmail.com> wrote:
> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>
> drivers/net/vxlan.c: In function ‘vxlan_sock_add’:
> drivers/net/vxlan.c:2298:11: warning: ‘sock’ may be used uninitialized in this function [-Wmaybe-uninitialized]
> drivers/net/vxlan.c:2275:17: note: ‘sock’ was declared here
> LD drivers/net/built-in.o
>
> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
This is much better.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/3] vxlan: silence one build warning
2013-10-28 6:01 [PATCH v2 1/3] vxlan: silence one build warning Zhi Yong Wu
` (2 preceding siblings ...)
2013-10-28 15:24 ` [PATCH v2 1/3] vxlan: silence one build warning Stephen Hemminger
@ 2013-10-29 4:19 ` David Miller
3 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2013-10-29 4:19 UTC (permalink / raw)
To: zwu.kernel; +Cc: netdev, linux-kernel, stephen, wuzhy
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: Text/Plain; charset=iso-8859-7, Size: 635 bytes --]
From: Zhi Yong Wu <zwu.kernel@gmail.com>
Date: Mon, 28 Oct 2013 14:01:48 +0800
> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>
> drivers/net/vxlan.c: In function ¡vxlan_sock_add¢:
> drivers/net/vxlan.c:2298:11: warning: ¡sock¢ may be used uninitialized in this function [-Wmaybe-uninitialized]
> drivers/net/vxlan.c:2275:17: note: ¡sock¢ was declared here
> LD drivers/net/built-in.o
>
> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Applied to net-next.
ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þG«éÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á¶iOæ¬z·vØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?I¥
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/3] net, datagram: fix the incorrect comment in zerocopy_sg_from_iovec()
2013-10-28 6:01 ` [PATCH v2 2/3] net, datagram: fix the incorrect comment in zerocopy_sg_from_iovec() Zhi Yong Wu
@ 2013-10-29 4:19 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2013-10-29 4:19 UTC (permalink / raw)
To: zwu.kernel; +Cc: netdev, linux-kernel, stephen, wuzhy
From: Zhi Yong Wu <zwu.kernel@gmail.com>
Date: Mon, 28 Oct 2013 14:01:49 +0800
> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>
> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Applied to net-next.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 3/3] net, iovec: fix the incorrect comment in memcpy_fromiovecend()
2013-10-28 6:01 ` [PATCH v2 3/3] net, iovec: fix the incorrect comment in memcpy_fromiovecend() Zhi Yong Wu
@ 2013-10-29 4:19 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2013-10-29 4:19 UTC (permalink / raw)
To: zwu.kernel; +Cc: netdev, linux-kernel, stephen, wuzhy
From: Zhi Yong Wu <zwu.kernel@gmail.com>
Date: Mon, 28 Oct 2013 14:01:50 +0800
> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>
> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Applied to net-next
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-10-29 4:19 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-28 6:01 [PATCH v2 1/3] vxlan: silence one build warning Zhi Yong Wu
2013-10-28 6:01 ` [PATCH v2 2/3] net, datagram: fix the incorrect comment in zerocopy_sg_from_iovec() Zhi Yong Wu
2013-10-29 4:19 ` David Miller
2013-10-28 6:01 ` [PATCH v2 3/3] net, iovec: fix the incorrect comment in memcpy_fromiovecend() Zhi Yong Wu
2013-10-29 4:19 ` David Miller
2013-10-28 15:24 ` [PATCH v2 1/3] vxlan: silence one build warning Stephen Hemminger
2013-10-29 4:19 ` 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).