tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 3752aee9 4ed4b547

+8 -4
+2
drivers/atm/he.c
··· 1928 1928 #ifdef notdef 1929 1929 ATM_SKB(skb)->vcc = vcc; 1930 1930 #endif 1931 + spin_unlock(&he_dev->global_lock); 1931 1932 vcc->push(vcc, skb); 1933 + spin_lock(&he_dev->global_lock); 1932 1934 1933 1935 atomic_inc(&vcc->stats->rx); 1934 1936
+4 -4
net/ipv4/fib_trie.c
··· 1281 1281 struct fib_result *res) 1282 1282 { 1283 1283 int err, i; 1284 - t_key mask; 1284 + __be32 mask; 1285 1285 struct leaf_info *li; 1286 1286 struct hlist_head *hhead = &l->list; 1287 1287 struct hlist_node *node; 1288 1288 1289 1289 hlist_for_each_entry_rcu(li, node, hhead, hlist) { 1290 1290 i = li->plen; 1291 - mask = ntohl(inet_make_mask(i)); 1292 - if (l->key != (key & mask)) 1291 + mask = inet_make_mask(i); 1292 + if (l->key != (key & ntohl(mask))) 1293 1293 continue; 1294 1294 1295 - if ((err = fib_semantic_match(&li->falh, flp, res, l->key, mask, i)) <= 0) { 1295 + if ((err = fib_semantic_match(&li->falh, flp, res, htonl(l->key), mask, i)) <= 0) { 1296 1296 *plen = i; 1297 1297 #ifdef CONFIG_IP_FIB_TRIE_STATS 1298 1298 t->stats.semantic_match_passed++;
+2
net/netfilter/xt_quota.c
··· 11 11 12 12 MODULE_LICENSE("GPL"); 13 13 MODULE_AUTHOR("Sam Johnston <samj@samj.net>"); 14 + MODULE_ALIAS("ipt_quota"); 15 + MODULE_ALIAS("ip6t_quota"); 14 16 15 17 static DEFINE_SPINLOCK(quota_lock); 16 18