Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2 files changed, 15 insertions, 13 deletions

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index c2a0346f423b..e6e23eb14428 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -1411,21 +1411,22 @@ static struct file_operations dn_dev_seq_fops = {
 
 #endif /* CONFIG_PROC_FS */
 
-static struct rtnetlink_link dnet_rtnetlink_table[RTM_MAX-RTM_BASE+1] = 
+static struct rtnetlink_link dnet_rtnetlink_table[RTM_NR_MSGTYPES] =
 {
-         [4] = { .doit   = dn_dev_rtm_newaddr,  },
-         [5] = { .doit   = dn_dev_rtm_deladdr,  },
-         [6] = { .dumpit = dn_dev_dump_ifaddr,  },
-
+        [RTM_NEWADDR  - RTM_BASE] = { .doit     = dn_dev_rtm_newaddr,   },
+        [RTM_DELADDR  - RTM_BASE] = { .doit     = dn_dev_rtm_deladdr,   },
+        [RTM_GETADDR  - RTM_BASE] = { .dumpit   = dn_dev_dump_ifaddr,   },
 #ifdef CONFIG_DECNET_ROUTER
-         [8] = { .doit   = dn_fib_rtm_newroute, },
-         [9] = { .doit   = dn_fib_rtm_delroute, },
-        [10] = { .doit   = dn_cache_getroute, .dumpit = dn_fib_dump, },
-        [16] = { .doit   = dn_fib_rtm_newrule, },
-        [17] = { .doit   = dn_fib_rtm_delrule, },
-        [18] = { .dumpit = dn_fib_dump_rules,  },
+        [RTM_NEWROUTE - RTM_BASE] = { .doit     = dn_fib_rtm_newroute,  },
+        [RTM_DELROUTE - RTM_BASE] = { .doit     = dn_fib_rtm_delroute,  },
+        [RTM_GETROUTE - RTM_BASE] = { .doit     = dn_cache_getroute,
+                                      .dumpit   = dn_fib_dump,          },
+        [RTM_NEWRULE  - RTM_BASE] = { .doit     = dn_fib_rtm_newrule,   },
+        [RTM_DELRULE  - RTM_BASE] = { .doit     = dn_fib_rtm_delrule,   },
+        [RTM_GETRULE  - RTM_BASE] = { .dumpit   = dn_fib_dump_rules,    },
 #else
-        [10] = { .doit   = dn_cache_getroute, .dumpit = dn_cache_dump, },
+        [RTM_GETROUTE - RTM_BASE] = { .doit     = dn_cache_getroute,
+                                      .dumpit   = dn_cache_dump,        
 #endif
 
 };
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
index f86a6259fd12..284a9998e53d 100644
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -119,8 +119,9 @@ static inline void dnrmg_receive_user_skb(struct sk_buff *skb)
 static void dnrmg_receive_user_sk(struct sock *sk, int len)
 {
         struct sk_buff *skb;
+        unsigned int qlen = skb_queue_len(&sk->sk_receive_queue);
 
-        while((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
+        for (; qlen && (skb = skb_dequeue(&sk->sk_receive_queue)); qlen--) {
                 dnrmg_receive_user_skb(skb);
                 kfree_skb(skb);
         }