summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2012-06-07 20:57:45 +0800
committerAndy Green <andy.green@linaro.org>2012-06-22 10:33:04 +0800
commitd75072c05c93da329675f330a26efe523b88f68d (patch)
tree8106cb827cef23f28ccd3504b755bca611c04ab5 /net
parentf8ba563d39a3fed966d257c468fe4acedf68517b (diff)
clean remove all warnings from build
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp.c2
-rw-r--r--net/rpmsg/rpmsg_proto.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index cf54e10b2587..7d711149fe5c 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3371,7 +3371,7 @@ int tcp_nuke_addr(struct net *net, struct sockaddr *addr)
struct in_addr *in;
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
- struct in6_addr *in6;
+ struct in6_addr *in6 = NULL;
#endif
if (family == AF_INET) {
in = &((struct sockaddr_in *)addr)->sin_addr;
diff --git a/net/rpmsg/rpmsg_proto.c b/net/rpmsg/rpmsg_proto.c
index e060663d68c9..2091b9109938 100644
--- a/net/rpmsg/rpmsg_proto.c
+++ b/net/rpmsg/rpmsg_proto.c
@@ -546,7 +546,7 @@ static struct rpmsg_device_id rpmsg_proto_id_table[] = {
};
MODULE_DEVICE_TABLE(rpmsg, rpmsg_proto_id_table);
-static struct rpmsg_driver rpmsg_proto_drv = {
+static struct rpmsg_driver rpmsg_proto_driver = {
.drv.name = KBUILD_MODNAME,
.drv.owner = THIS_MODULE,
.id_table = rpmsg_proto_id_table,
@@ -572,7 +572,7 @@ static int __init rpmsg_proto_init(void)
}
/* gimme rpmsg channels to expose ! */
- ret = register_rpmsg_driver(&rpmsg_proto_drv);
+ ret = register_rpmsg_driver(&rpmsg_proto_driver);
if (ret) {
pr_err("register_rpmsg_driver failed: %d\n", ret);
goto sock_unreg;
@@ -589,7 +589,7 @@ proto_unreg:
static void __exit rpmsg_proto_exit(void)
{
- unregister_rpmsg_driver(&rpmsg_proto_drv);
+ unregister_rpmsg_driver(&rpmsg_proto_driver);
sock_unregister(PF_RPMSG);
proto_unregister(&rpmsg_proto);
}