Commit 7abaa27c authored by Chuck Short's avatar Chuck Short Committed by David S. Miller

[IPV4]: Fix route.c gcc4 warnings

Signed-off by: Chuck Short <zulcss@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fbeec2e1
...@@ -1767,7 +1767,7 @@ static inline int ip_mkroute_input_def(struct sk_buff *skb, ...@@ -1767,7 +1767,7 @@ static inline int ip_mkroute_input_def(struct sk_buff *skb,
struct in_device *in_dev, struct in_device *in_dev,
u32 daddr, u32 saddr, u32 tos) u32 daddr, u32 saddr, u32 tos)
{ {
struct rtable* rth; struct rtable* rth = NULL;
int err; int err;
unsigned hash; unsigned hash;
...@@ -1794,7 +1794,7 @@ static inline int ip_mkroute_input(struct sk_buff *skb, ...@@ -1794,7 +1794,7 @@ static inline int ip_mkroute_input(struct sk_buff *skb,
u32 daddr, u32 saddr, u32 tos) u32 daddr, u32 saddr, u32 tos)
{ {
#ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED #ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
struct rtable* rth; struct rtable* rth = NULL;
unsigned char hop, hopcount, lasthop; unsigned char hop, hopcount, lasthop;
int err = -EINVAL; int err = -EINVAL;
unsigned int hash; unsigned int hash;
...@@ -2239,7 +2239,7 @@ static inline int ip_mkroute_output_def(struct rtable **rp, ...@@ -2239,7 +2239,7 @@ static inline int ip_mkroute_output_def(struct rtable **rp,
struct net_device *dev_out, struct net_device *dev_out,
unsigned flags) unsigned flags)
{ {
struct rtable *rth; struct rtable *rth = NULL;
int err = __mkroute_output(&rth, res, fl, oldflp, dev_out, flags); int err = __mkroute_output(&rth, res, fl, oldflp, dev_out, flags);
unsigned hash; unsigned hash;
if (err == 0) { if (err == 0) {
...@@ -2267,7 +2267,7 @@ static inline int ip_mkroute_output(struct rtable** rp, ...@@ -2267,7 +2267,7 @@ static inline int ip_mkroute_output(struct rtable** rp,
unsigned char hop; unsigned char hop;
unsigned hash; unsigned hash;
int err = -EINVAL; int err = -EINVAL;
struct rtable *rth; struct rtable *rth = NULL;
if (res->fi && res->fi->fib_nhs > 1) { if (res->fi && res->fi->fib_nhs > 1) {
unsigned char hopcount = res->fi->fib_nhs; unsigned char hopcount = res->fi->fib_nhs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment