Merge bk://kernel.bkbits.net/davem/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Documentation/networking/ip-sysctl.txt

@@ -307,6 +307,15 @@ tcp_westwood - BOOLEAN
 	wired networks and throughput over wireless links.   
         Default: 0
 
+tcp_vegas_cong_avoid - BOOLEAN
+	Enable TCP Vegas congestion avoidance algorithm.
+	TCP Vegas is a sender-side only change to TCP that anticipates
+	the onset of congestion by estimating the bandwidth. TCP Vegas
+	adjusts the sending rate by modifying the congestion
+	window. TCP Vegas should provide less packet loss, but it is
+	not as aggressive as TCP Reno.
+	Default:0
+
 ip_local_port_range - 2 INTEGERS
 	Defines the local port range that is used by TCP and UDP to
 	choose the local port. The first number is the first, the 
@@ -714,13 +723,13 @@ temp_valid_lft - INTEGER
 	Default: 604800 (7 days)
 
 temp_prefered_lft - INTEGER
-	Preferred lifetime (in seconds) for temorary addresses.
+	Preferred lifetime (in seconds) for temporary addresses.
 	Default: 86400 (1 day)
 
 max_desync_factor - INTEGER
 	Maximum value for DESYNC_FACTOR, which is a random value
 	that ensures that clients don't synchronize with each 
-	other and generage new addresses at exactly the same time.
+	other and generate new addresses at exactly the same time.
 	value is in seconds.
 	Default: 600
 	

net/irda/irda_device.c

@@ -232,6 +232,7 @@ void irda_task_delete(struct irda_task *task)
 
 	__irda_task_delete(task);
 }
+EXPORT_SYMBOL(irda_task_delete);
 
 /*
  * Function irda_task_kick (task)

net/sunrpc/svcauth_unix.c

@@ -51,6 +51,8 @@ struct auth_domain *unix_domain_find(char *name)
 		return rv;
 
 	new = kmalloc(sizeof(*new), GFP_KERNEL);
+	if (new == NULL)
+		return NULL;
 	cache_init(&new->h.h);
 	atomic_inc(&new->h.h.refcnt);
 	new->h.name = strdup(name);