Merge branch 'master' of ../net-2.6/

Conflicts:

	net/ipv6/ndisc.c

8 files changed, 38 insertions, 20 deletions

diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index 1aa9d5175398..4e8d4e724b96 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -861,7 +861,6 @@ static void p9_mux_free_request(struct p9_conn *m, struct p9_req *req)
 
 static void p9_mux_flush_cb(struct p9_req *freq, void *a)
 {
-        p9_conn_req_callback cb;
         int tag;
         struct p9_conn *m;
         struct p9_req *req, *rreq, *rptr;
@@ -872,7 +871,6 @@ static void p9_mux_flush_cb(struct p9_req *freq, void *a)
                 freq->tcall->params.tflush.oldtag);
 
         spin_lock(&m->lock);
-        cb = NULL;
         tag = freq->tcall->params.tflush.oldtag;
         req = NULL;
         list_for_each_entry_safe(rreq, rptr, &m->req_list, req_list) {
diff --git a/net/atm/clip.c b/net/atm/clip.c
index d45971bd286c..e82da6746723 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -943,6 +943,8 @@ static const struct file_operations arp_seq_fops = {
 };
 #endif
 
+static void atm_clip_exit_noproc(void);
+
 static int __init atm_clip_init(void)
 {
         neigh_table_init_no_netlink(&clip_tbl);
@@ -959,18 +961,22 @@ static int __init atm_clip_init(void)
                 struct proc_dir_entry *p;
 
                 p = proc_create("arp", S_IRUGO, atm_proc_root, &arp_seq_fops);
+                if (!p) {
+                        printk(KERN_ERR "Unable to initialize "
+                               "/proc/net/atm/arp\n");
+                        atm_clip_exit_noproc();
+                        return -ENOMEM;
+                }
         }
 #endif
 
         return 0;
 }
 
-static void __exit atm_clip_exit(void)
+static void atm_clip_exit_noproc(void)
 {
         struct net_device *dev, *next;
 
-        remove_proc_entry("arp", atm_proc_root);
-
         unregister_inetaddr_notifier(&clip_inet_notifier);
         unregister_netdevice_notifier(&clip_dev_notifier);
 
@@ -1001,6 +1007,13 @@ static void __exit atm_clip_exit(void)
         clip_tbl_hook = NULL;
 }
 
+static void __exit atm_clip_exit(void)
+{
+        remove_proc_entry("arp", atm_proc_root);
+
+        atm_clip_exit_noproc();
+}
+
 module_init(atm_clip_init);
 module_exit(atm_clip_exit);
 MODULE_AUTHOR("Werner Almesberger");
diff --git a/net/atm/lec.c b/net/atm/lec.c
index e2d800d818e3..aa3785ebf6d1 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -1225,6 +1225,10 @@ static int __init lane_module_init(void)
         struct proc_dir_entry *p;
 
         p = proc_create("lec", S_IRUGO, atm_proc_root, &lec_seq_fops);
+        if (!p) {
+                printk(KERN_ERR "Unable to initialize /proc/net/atm/lec\n");
+                return -ENOMEM;
+        }
 #endif
 
         register_atm_ioctl(&lane_ioctl_ops);
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index a7d089eb042e..ce6cb34e28e1 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -177,10 +177,13 @@ static inline struct tnode *node_parent_rcu(struct node *node)
         return rcu_dereference(ret);
 }
 
+/* Same as rcu_assign_pointer
+ * but that macro() assumes that value is a pointer.
+ */
 static inline void node_set_parent(struct node *node, struct tnode *ptr)
 {
-        rcu_assign_pointer(node->parent,
-                           (unsigned long)ptr | NODE_TYPE(node));
+        smp_wmb();
+        node->parent = (unsigned long)ptr | NODE_TYPE(node);
 }
 
 static inline struct node *tnode_get_child(struct tnode *tn, unsigned int i)
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index a2e92f9709db..3b2e5adca838 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -568,7 +568,7 @@ int ip_defrag(struct sk_buff *skb, u32 user)
 
         IP_INC_STATS_BH(IPSTATS_MIB_REASMREQDS);
 
-        net = skb->dev->nd_net;
+        net = skb->dev ? skb->dev->nd_net : skb->dst->dev->nd_net;
         /* Start by cleaning up the memory. */
         if (atomic_read(&net->ipv4.frags.mem) > net->ipv4.frags.high_thresh)
                 ip_evictor(net);
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index e0fbc25ca816..58ac838bf460 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -735,7 +735,7 @@ new_segment:
                 if (!(psize -= copy))
                         goto out;
 
-                if (skb->len < mss_now || (flags & MSG_OOB))
+                if (skb->len < size_goal || (flags & MSG_OOB))
                         continue;
 
                 if (forced_push(tp)) {
@@ -981,7 +981,7 @@ new_segment:
                         if ((seglen -= copy) == 0 && iovlen == 0)
                                 goto out;
 
-                        if (skb->len < mss_now || (flags & MSG_OOB))
+                        if (skb->len < size_goal || (flags & MSG_OOB))
                                 continue;
 
                         if (forced_push(tp)) {
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 795c761ad99f..66148cc4759e 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -711,9 +711,11 @@ static void htb_charge_class(struct htb_sched *q, struct htb_class *cl,
  */
 static psched_time_t htb_do_events(struct htb_sched *q, int level)
 {
-        int i;
-
-        for (i = 0; i < 500; i++) {
+        /* don't run for longer than 2 jiffies; 2 is used instead of
+           1 to simplify things when jiffy is going to be incremented
+           too soon */
+        unsigned long stop_at = jiffies + 2;
+        while (time_before(jiffies, stop_at)) {
                 struct htb_class *cl;
                 long diff;
                 struct rb_node *p = rb_first(&q->wait_pq[level]);
@@ -731,9 +733,8 @@ static psched_time_t htb_do_events(struct htb_sched *q, int level)
                 if (cl->cmode != HTB_CAN_SEND)
                         htb_add_to_wait_tree(q, cl, diff);
         }
-        if (net_ratelimit())
-                printk(KERN_WARNING "htb: too many events !\n");
-        return q->now + PSCHED_TICKS_PER_SEC / 10;
+        /* too much load - let's continue on next jiffie */
+        return q->now + PSCHED_TICKS_PER_SEC / HZ;
 }
 
 /* Returns class->node+prio from id-tree where classe's id is >= id. NULL
diff --git a/net/socket.c b/net/socket.c
index b6d35cd72a50..9d3fbfbc8535 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -909,11 +909,10 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
                         if (!dlci_ioctl_hook)
                                 request_module("dlci");
 
-                        if (dlci_ioctl_hook) {
-                                mutex_lock(&dlci_ioctl_mutex);
+                        mutex_lock(&dlci_ioctl_mutex);
+                        if (dlci_ioctl_hook)
                                 err = dlci_ioctl_hook(cmd, argp);
-                                mutex_unlock(&dlci_ioctl_mutex);
-                        }
+                        mutex_unlock(&dlci_ioctl_mutex);
                         break;
                 default:
                         err = sock->ops->ioctl(sock, cmd, arg);