Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 256019
b: refs/heads/master
c: c485538
h: refs/heads/master
i:
  256017: 6dad73c
  256015: 8099e64
v: v3
  • Loading branch information
Joe Perches authored and David S. Miller committed Jul 1, 2011
1 parent e3ea5c2 commit 6f745f5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 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: fcb261f35714fdf3d5c37d714e55b507b8cd55bc
refs/heads/master: c485538901e0334a3016241bf73b864216ff2e73
22 changes: 13 additions & 9 deletions trunk/net/netrom/nr_route.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,12 @@ static int __must_check nr_add_node(ax25_address *nr, const char *mnemonic,
case 3:
if (nr_node->routes[1].quality > nr_node->routes[0].quality) {
switch (nr_node->which) {
case 0: nr_node->which = 1; break;
case 1: nr_node->which = 0; break;
default: break;
case 0:
nr_node->which = 1;
break;
case 1:
nr_node->which = 0;
break;
}
nr_route = nr_node->routes[0];
nr_node->routes[0] = nr_node->routes[1];
Expand Down Expand Up @@ -505,12 +508,13 @@ static int nr_dec_obs(void)
s->count--;

switch (i) {
case 0:
s->routes[0] = s->routes[1];
case 1:
s->routes[1] = s->routes[2];
case 2:
break;
case 0:
s->routes[0] = s->routes[1];
/* Fallthrough */
case 1:
s->routes[1] = s->routes[2];
case 2:
break;
}
break;

Expand Down

0 comments on commit 6f745f5

Please sign in to comment.