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

Commit 3752aee9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IPV4] fib_trie: missing ntohl() when calling fib_semantic_match()
  [NETFILTER]: xt_quota: add missing module aliases
  [ATM]: [he] don't hold the device lock when upcalling
parents 4ed4b547 888454c5

drivers/atm/he.c

+2 −0
Original line number Diff line number Diff line
@@ -1928,7 +1928,9 @@ he_service_rbrq(struct he_dev *he_dev, int group) 
#ifdef notdef

		ATM_SKB(skb)->vcc = vcc;

#endif

		spin_unlock(&he_dev->global_lock);

		vcc->push(vcc, skb);

		spin_lock(&he_dev->global_lock);



		atomic_inc(&vcc->stats->rx);

net/ipv4/fib_trie.c

+4 −4
Original line number Diff line number Diff line
@@ -1281,18 +1281,18 @@ static inline int check_leaf(struct trie *t, struct leaf *l, 
			     struct fib_result *res)

{

	int err, i;

	t_key mask;

	__be32 mask;

	struct leaf_info *li;

	struct hlist_head *hhead = &l->list;

	struct hlist_node *node;



	hlist_for_each_entry_rcu(li, node, hhead, hlist) {

		i = li->plen;

		mask = ntohl(inet_make_mask(i));

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

		mask = inet_make_mask(i);

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

			continue;



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

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

			*plen = i;

#ifdef CONFIG_IP_FIB_TRIE_STATS

			t->stats.semantic_match_passed++;

net/netfilter/xt_quota.c

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 


MODULE_LICENSE("GPL");

MODULE_AUTHOR("Sam Johnston <samj@samj.net>");

MODULE_ALIAS("ipt_quota");

MODULE_ALIAS("ip6t_quota");



static DEFINE_SPINLOCK(quota_lock);