Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [ICMP]: Fix icmp_errors_use_inbound_ifaddr sysctl
  [IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP
  [NET] gso: Fix GSO feature mask in sk_setup_caps
  [TCP]: Fix GSO ignorance of pkts_acked arg (cong.cntrl modules)
  [NET]: Fix comparisons of unsigned < 0.
  [NET]: Make net watchdog timers 1 sec jiffy aligned.
  [ATM]: Fix warning.
  [TCP]: Use default 32768-61000 outgoing port range in all cases.
  [AF_UNIX]: Fix datagram connect race causing an OOPS.
  [TG3]: Fix link problem on Dell's onboard 5906.
  [AF_UNIX]: Make socket locking much less confusing.

1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 9c67df5ccfa4..7f6d02ce1b5f 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1475,6 +1475,7 @@ static void top_off_fp (struct fs_dev *dev, struct freepool *fp,
         struct FS_BPENTRY *qe, *ne;
         struct sk_buff *skb;
         int n = 0;
+        u32 qe_tmp;
 
         fs_dprintk (FS_DEBUG_QUEUE, "Topping off queue at %x (%d-%d/%d)\n", 
                     fp->offset, read_fs (dev, FP_CNT (fp->offset)), fp->n, 
@@ -1502,10 +1503,16 @@ static void top_off_fp (struct fs_dev *dev, struct freepool *fp,
                 ne->skb = skb;
                 ne->fp = fp;
 
-                qe = (struct FS_BPENTRY *) (read_fs (dev, FP_EA(fp->offset)));
-                fs_dprintk (FS_DEBUG_QUEUE, "link at %p\n", qe);
-                if (qe) {
-                        qe = bus_to_virt ((long) qe);
+                /*
+                 * FIXME: following code encodes and decodes
+                 * machine pointers (could be 64-bit) into a
+                 * 32-bit register.
+                 */
+
+                qe_tmp = read_fs (dev, FP_EA(fp->offset));
+                fs_dprintk (FS_DEBUG_QUEUE, "link at %x\n", qe_tmp);
+                if (qe_tmp) {
+                        qe = bus_to_virt ((long) qe_tmp);
                         qe->next = virt_to_bus(ne);
                         qe->flags &= ~FP_FLAGS_EPI;
                 } else