Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 2835
b: refs/heads/master
c: 7abaa27
h: refs/heads/master
i:
  2833: 11a159e
  2831: 15462d3
v: v3
  • Loading branch information
Chuck Short authored and David S. Miller committed Jun 23, 2005
1 parent 5746914 commit 31b6a3a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fbeec2e1552949002065435c9829dc244ad85407
refs/heads/master: 7abaa27c1c54208bd76fa8bae55839c034aebfb2
8 changes: 4 additions & 4 deletions trunk/net/ipv4/route.c
Original file line number Diff line number Diff line change
Expand Up @@ -1767,7 +1767,7 @@ static inline int ip_mkroute_input_def(struct sk_buff *skb,
struct in_device *in_dev,
u32 daddr, u32 saddr, u32 tos)
{
struct rtable* rth;
struct rtable* rth = NULL;
int err;
unsigned hash;

Expand All @@ -1794,7 +1794,7 @@ static inline int ip_mkroute_input(struct sk_buff *skb,
u32 daddr, u32 saddr, u32 tos)
{
#ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
struct rtable* rth;
struct rtable* rth = NULL;
unsigned char hop, hopcount, lasthop;
int err = -EINVAL;
unsigned int hash;
Expand Down Expand Up @@ -2239,7 +2239,7 @@ static inline int ip_mkroute_output_def(struct rtable **rp,
struct net_device *dev_out,
unsigned flags)
{
struct rtable *rth;
struct rtable *rth = NULL;
int err = __mkroute_output(&rth, res, fl, oldflp, dev_out, flags);
unsigned hash;
if (err == 0) {
Expand Down Expand Up @@ -2267,7 +2267,7 @@ static inline int ip_mkroute_output(struct rtable** rp,
unsigned char hop;
unsigned hash;
int err = -EINVAL;
struct rtable *rth;
struct rtable *rth = NULL;

if (res->fi && res->fi->fib_nhs > 1) {
unsigned char hopcount = res->fi->fib_nhs;
Expand Down

0 comments on commit 31b6a3a

Please sign in to comment.