Merge branch 'cpus4096-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

* 'cpus4096-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  cpu masks: optimize and clean up cpumask_of_cpu()
  cpumask: export cpumask_of_cpu_map
  cpumask: change cpumask_of_cpu_ptr to use new cpumask_of_cpu
  cpumask: put cpumask_of_cpu_map in the initdata section
  cpumask: make cpumask_of_cpu_map generic

diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c
index 7d500f82195a08b22d1ab550ab95bb43e541dd7a..4c1820cad71230045624f002368c6c03efbd0061 100644 (file)
--- a/drivers/char/pcmcia/ipwireless/hardware.c
+++ b/drivers/char/pcmcia/ipwireless/hardware.c
@@ -568,7 +568,7 @@ static struct ipw_rx_packet *pool_allocate(struct ipw_hardware *hw,
                        list_del(&packet->queue);
                } else {
                        const int min_capacity =
-                               ipwireless_ppp_mru(hw->network + 2);
+                               ipwireless_ppp_mru(hw->network) + 2;
                        int new_capacity;
 
                        spin_unlock_irqrestore(&hw->lock, flags);