Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* 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
This commit is contained in:
Linus Torvalds 2006-09-19 20:36:22 -07:00
commit 3752aee965
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/atm/he.c
View file

@ -1928,7 +1928,9 @@ he_service_rbrq(struct he_dev *he_dev, int group)
#ifdef notdef #ifdef notdef
ATM_SKB(skb)->vcc = vcc; ATM_SKB(skb)->vcc = vcc;
#endif #endif
spin_unlock(&he_dev->global_lock);
vcc->push(vcc, skb); vcc->push(vcc, skb);
spin_lock(&he_dev->global_lock);
atomic_inc(&vcc->stats->rx); atomic_inc(&vcc->stats->rx);

8
net/ipv4/fib_trie.c
View file

@ -1281,18 +1281,18 @@ static inline int check_leaf(struct trie *t, struct leaf *l,
struct fib_result *res) struct fib_result *res)
{ {
int err, i; int err, i;
t_key mask; __be32 mask;
struct leaf_info *li; struct leaf_info *li;
struct hlist_head *hhead = &l->list; struct hlist_head *hhead = &l->list;
struct hlist_node *node; struct hlist_node *node;
hlist_for_each_entry_rcu(li, node, hhead, hlist) { hlist_for_each_entry_rcu(li, node, hhead, hlist) {
i = li->plen; i = li->plen;
mask = ntohl(inet_make_mask(i)); mask = inet_make_mask(i);
if (l->key != (key & mask)) if (l->key != (key & ntohl(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, htonl(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++;

2
net/netfilter/xt_quota.c
View file

@ -11,6 +11,8 @@
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Sam Johnston <samj@samj.net>"); MODULE_AUTHOR("Sam Johnston <samj@samj.net>");
MODULE_ALIAS("ipt_quota");
MODULE_ALIAS("ip6t_quota");
static DEFINE_SPINLOCK(quota_lock); static DEFINE_SPINLOCK(quota_lock);