Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[muen/linux.git] / net / ipv4 / route.c
index 594a1c605c92286cb6dfdf7fc81431906a7a598c..ccb25d80f67956b12b3ffd57f7ac5ddc9b2cb6c0 100644 (file)
@@ -2296,13 +2296,14 @@ struct rtable *ip_route_output_key_hash(struct net *net, struct flowi4 *fl4,
                                        const struct sk_buff *skb)
 {
        __u8 tos = RT_FL_TOS(fl4);
                                        const struct sk_buff *skb)
 {
        __u8 tos = RT_FL_TOS(fl4);
-       struct fib_result res;
+       struct fib_result res = {
+               .type           = RTN_UNSPEC,
+               .fi             = NULL,
+               .table          = NULL,
+               .tclassid       = 0,
+       };
        struct rtable *rth;
 
        struct rtable *rth;
 
-       res.tclassid    = 0;
-       res.fi          = NULL;
-       res.table       = NULL;
-
        fl4->flowi4_iif = LOOPBACK_IFINDEX;
        fl4->flowi4_tos = tos & IPTOS_RT_MASK;
        fl4->flowi4_scope = ((tos & RTO_ONLINK) ?
        fl4->flowi4_iif = LOOPBACK_IFINDEX;
        fl4->flowi4_tos = tos & IPTOS_RT_MASK;
        fl4->flowi4_scope = ((tos & RTO_ONLINK) ?