Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13142341 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git

parents 3fd1bb9b d4ef1608

drivers/net/tg3.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -66,8 +66,8 @@ 




#define DRV_MODULE_NAME		"tg3"

#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.36"

#define DRV_MODULE_VERSION	"3.37"

#define DRV_MODULE_RELDATE	"August 19, 2005"

#define DRV_MODULE_RELDATE	"August 25, 2005"





#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0

#define TG3_DEF_RX_MODE		0
@@ -7865,8 +7865,6 @@ static int tg3_test_loopback(struct tg3 *tp) 




	err = -EIO;

	err = -EIO;





	tg3_abort_hw(tp, 1);



	tg3_reset_hw(tp);

	tg3_reset_hw(tp);





	mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |

	mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |

net/ipv4/fib_trie.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -1333,9 +1333,9 @@ err:; 
}

}





static inline int check_leaf(struct trie *t, struct leaf *l,  t_key key, int *plen, const struct flowi *flp,

static inline int check_leaf(struct trie *t, struct leaf *l,  t_key key, int *plen, const struct flowi *flp,

			     struct fib_result *res, int *err)

			     struct fib_result *res)

{

{

	int i;

	int err, i;

	t_key mask;

	t_key mask;

	struct leaf_info *li;

	struct leaf_info *li;

	struct hlist_head *hhead = &l->list;

	struct hlist_head *hhead = &l->list;
@@ -1348,18 +1348,18 @@ static inline int check_leaf(struct trie *t, struct leaf *l, t_key key, int *pl 
		if (l->key != (key & mask))

		if (l->key != (key & mask))

			continue;

			continue;





		if (((*err) = fib_semantic_match(&li->falh, flp, res, l->key, mask, i)) == 0) {

		if ((err = fib_semantic_match(&li->falh, flp, res, l->key, mask, i)) <= 0) {

			*plen = i;

			*plen = i;

#ifdef CONFIG_IP_FIB_TRIE_STATS

#ifdef CONFIG_IP_FIB_TRIE_STATS

			t->stats.semantic_match_passed++;

			t->stats.semantic_match_passed++;

#endif

#endif

			return 1;

			return err;

		}

		}

#ifdef CONFIG_IP_FIB_TRIE_STATS

#ifdef CONFIG_IP_FIB_TRIE_STATS

		t->stats.semantic_match_miss++;

		t->stats.semantic_match_miss++;

#endif

#endif

	}

	}

	return 0;

	return 1;

}

}





static int

static int
@@ -1386,7 +1386,7 @@ fn_trie_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result 




	/* Just a leaf? */

	/* Just a leaf? */

	if (IS_LEAF(n)) {

	if (IS_LEAF(n)) {

		if (check_leaf(t, (struct leaf *)n, key, &plen, flp, res, &ret))

		if ((ret = check_leaf(t, (struct leaf *)n, key, &plen, flp, res)) <= 0)

			goto found;

			goto found;

		goto failed;

		goto failed;

	}

	}
@@ -1508,7 +1508,7 @@ fn_trie_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result 
		       continue;

		       continue;

		}

		}

		if (IS_LEAF(n)) {

		if (IS_LEAF(n)) {

			if (check_leaf(t, (struct leaf *)n, key, &plen, flp, res, &ret))

			if ((ret = check_leaf(t, (struct leaf *)n, key, &plen, flp, res)) <= 0)

				goto found;

				goto found;

	       }

	       }

backtrace:

backtrace: