summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-20 00:48:28 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-20 00:48:28 -0400
commit783c99f42e221217761e9c319838d5533107f7cb (patch)
treeff09cb67fc0875450e83906af887fe219bc99c53 /net
parentf8ec473387f70d103c83ffb3ab50cb2b1380d0c0 (diff)
parente478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff)
downloadlinux-stable-783c99f42e221217761e9c319838d5533107f7cb.tar.gz
linux-stable-783c99f42e221217761e9c319838d5533107f7cb.tar.bz2
linux-stable-783c99f42e221217761e9c319838d5533107f7cb.zip
Merge branch 'master' into upstream
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/fib_trie.c8
-rw-r--r--net/netfilter/xt_quota.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 23fb9d9768e3..01801c0f885d 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -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++;
diff --git a/net/netfilter/xt_quota.c b/net/netfilter/xt_quota.c
index 4cdba7469dc4..be8d3c26b568 100644
--- a/net/netfilter/xt_quota.c
+++ b/net/netfilter/xt_quota.c
@@ -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);