1 files changed, 39 insertions, 34 deletions

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index e7a711f53a6..03a7a85d042 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -256,8 +256,8 @@ static int fwnet_header_rebuild(struct sk_buff *skb)
         if (get_unaligned_be16(&h->h_proto) == ETH_P_IP)
                 return arp_find((unsigned char *)&h->h_dest, skb);
 
-        dev_notice(&skb->dev->dev, "unable to resolve type %04x addresses\n",
-                   be16_to_cpu(h->h_proto));
+        fw_notify("%s: unable to resolve type %04x addresses\n",
+                  skb->dev->name, be16_to_cpu(h->h_proto));
         return 0;
 }
 
@@ -369,7 +369,7 @@ static struct fwnet_fragment_info *fwnet_frag_new(
 
         new = kmalloc(sizeof(*new), GFP_ATOMIC);
         if (!new) {
-                dev_err(&pd->skb->dev->dev, "out of memory\n");
+                fw_error("out of memory\n");
                 return NULL;
         }
 
@@ -414,7 +414,7 @@ fail_w_fi:
 fail_w_new:
         kfree(new);
 fail:
-        dev_err(&net->dev, "out of memory\n");
+        fw_error("out of memory\n");
 
         return NULL;
 }
@@ -502,7 +502,11 @@ static struct fwnet_peer *fwnet_peer_find_by_node_id(struct fwnet_device *dev,
 static unsigned fwnet_max_payload(unsigned max_rec, unsigned speed)
 {
         max_rec = min(max_rec, speed + 8);
-        max_rec = clamp(max_rec, 8U, 11U); /* 512...4096 */
+        max_rec = min(max_rec, 0xbU); /* <= 4096 */
+        if (max_rec < 8) {
+                fw_notify("max_rec %x out of range\n", max_rec);
+                max_rec = 8;
+        }
 
         return (1 << (max_rec + 1)) - RFC2374_FRAG_HDR_SIZE;
 }
@@ -554,7 +558,7 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
                 sspd = arp1394->sspd;
                 /* Sanity check.  OS X 10.3 PPC reportedly sends 131. */
                 if (sspd > SCODE_3200) {
-                        dev_notice(&net->dev, "sspd %x out of range\n", sspd);
+                        fw_notify("sspd %x out of range\n", sspd);
                         sspd = SCODE_3200;
                 }
                 max_payload = fwnet_max_payload(arp1394->max_rec, sspd);
@@ -574,9 +578,8 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
                 spin_unlock_irqrestore(&dev->lock, flags);
 
                 if (!peer) {
-                        dev_notice(&net->dev,
-                                   "no peer for ARP packet from %016llx\n",
-                                   (unsigned long long)peer_guid);
+                        fw_notify("No peer for ARP packet from %016llx\n",
+                                  (unsigned long long)peer_guid);
                         goto no_peer;
                 }
 
@@ -692,7 +695,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
 
                 skb = dev_alloc_skb(len + net->hard_header_len + 15);
                 if (unlikely(!skb)) {
-                        dev_err(&net->dev, "out of memory\n");
+                        fw_error("out of memory\n");
                         net->stats.rx_dropped++;
 
                         return -ENOMEM;
@@ -815,7 +818,7 @@ static void fwnet_receive_packet(struct fw_card *card, struct fw_request *r,
                 rcode = RCODE_TYPE_ERROR;
         else if (fwnet_incoming_packet(dev, payload, length,
                                        source, generation, false) != 0) {
-                dev_err(&dev->netdev->dev, "incoming packet failure\n");
+                fw_error("Incoming packet failure\n");
                 rcode = RCODE_CONFLICT_ERROR;
         } else
                 rcode = RCODE_COMPLETE;
@@ -828,6 +831,7 @@ static void fwnet_receive_broadcast(struct fw_iso_context *context,
 {
         struct fwnet_device *dev;
         struct fw_iso_packet packet;
+        struct fw_card *card;
         __be16 *hdr_ptr;
         __be32 *buf_ptr;
         int retval;
@@ -839,6 +843,7 @@ static void fwnet_receive_broadcast(struct fw_iso_context *context,
         unsigned long flags;
 
         dev = data;
+        card = dev->card;
         hdr_ptr = header;
         length = be16_to_cpup(hdr_ptr);
 
@@ -859,8 +864,8 @@ static void fwnet_receive_broadcast(struct fw_iso_context *context,
         if (specifier_id == IANA_SPECIFIER_ID && ver == RFC2734_SW_VERSION) {
                 buf_ptr += 2;
                 length -= IEEE1394_GASP_HDR_SIZE;
-                fwnet_incoming_packet(dev, buf_ptr, length, source_node_id,
-                                      context->card->generation, true);
+                fwnet_incoming_packet(dev, buf_ptr, length,
+                                      source_node_id, -1, true);
         }
 
         packet.payload_length = dev->rcv_buffer_size;
@@ -880,7 +885,7 @@ static void fwnet_receive_broadcast(struct fw_iso_context *context,
         if (retval >= 0)
                 fw_iso_context_queue_flush(dev->broadcast_rcv_context);
         else
-                dev_err(&dev->netdev->dev, "requeue failed\n");
+                fw_error("requeue failed\n");
 }
 
 static struct kmem_cache *fwnet_packet_task_cache;
@@ -935,10 +940,9 @@ static void fwnet_transmit_packet_done(struct fwnet_packet_task *ptask)
                 case RFC2374_HDR_LASTFRAG:
                 case RFC2374_HDR_UNFRAG:
                 default:
-                        dev_err(&dev->netdev->dev,
-                                "outstanding packet %x lf %x, header %x,%x\n",
-                                ptask->outstanding_pkts, lf, ptask->hdr.w0,
-                                ptask->hdr.w1);
+                        fw_error("Outstanding packet %x lf %x, header %x,%x\n",
+                                 ptask->outstanding_pkts, lf, ptask->hdr.w0,
+                                 ptask->hdr.w1);
                         BUG();
 
                 case RFC2374_HDR_FIRSTFRAG:
@@ -956,12 +960,7 @@ static void fwnet_transmit_packet_done(struct fwnet_packet_task *ptask)
                         break;
                 }
 
-                if (ptask->dest_node == IEEE1394_ALL_NODES) {
-                        skb_pull(skb,
-                                 ptask->max_payload + IEEE1394_GASP_HDR_SIZE);
-                } else {
-                        skb_pull(skb, ptask->max_payload);
-                }
+                skb_pull(skb, ptask->max_payload);
                 if (ptask->outstanding_pkts > 1) {
                         fwnet_make_sf_hdr(&ptask->hdr, RFC2374_HDR_INTFRAG,
                                           dg_size, fg_off, datagram_label);
@@ -1015,9 +1014,8 @@ static void fwnet_write_complete(struct fw_card *card, int rcode,
                 fwnet_transmit_packet_failed(ptask);
 
                 if (printk_timed_ratelimit(&j,  1000) || rcode != last_rcode) {
-                        dev_err(&ptask->dev->netdev->dev,
-                                "fwnet_write_complete failed: %x (skipped %d)\n",
-                                rcode, errors_skipped);
+                        fw_error("fwnet_write_complete: "
+                                "failed: %x (skipped %d)\n", rcode, errors_skipped);
 
                         errors_skipped = 0;
                         last_rcode = rcode;
@@ -1065,7 +1063,7 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask)
                 smp_rmb();
                 node_id = dev->card->node_id;
 
-                p = skb_push(ptask->skb, IEEE1394_GASP_HDR_SIZE);
+                p = skb_push(ptask->skb, 8);
                 put_unaligned_be32(node_id << 16 | IANA_SPECIFIER_ID >> 8, p);
                 put_unaligned_be32((IANA_SPECIFIER_ID & 0xff) << 24
                                                 | RFC2734_SW_VERSION, &p[4]);
@@ -1127,12 +1125,17 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
         unsigned u;
 
         if (dev->local_fifo == FWNET_NO_FIFO_ADDR) {
+                /* outside OHCI posted write area? */
+                static const struct fw_address_region region = {
+                        .start = 0xffff00000000ULL,
+                        .end   = CSR_REGISTER_BASE,
+                };
+
                 dev->handler.length = 4096;
                 dev->handler.address_callback = fwnet_receive_packet;
                 dev->handler.callback_data = dev;
 
-                retval = fw_core_add_address_handler(&dev->handler,
-                                        &fw_high_memory_region);
+                retval = fw_core_add_address_handler(&dev->handler, &region);
                 if (retval < 0)
                         goto failed_initial;
 
@@ -1545,12 +1548,14 @@ static int fwnet_probe(struct device *_dev)
         put_unaligned_be64(card->guid, net->dev_addr);
         put_unaligned_be64(~0ULL, net->broadcast);
         ret = register_netdev(net);
-        if (ret)
+        if (ret) {
+                fw_error("Cannot register the driver\n");
                 goto out;
+        }
 
         list_add_tail(&dev->dev_link, &fwnet_device_list);
-        dev_notice(&net->dev, "IPv4 over IEEE 1394 on card %s\n",
-                   dev_name(card->device));
+        fw_notify("%s: IPv4 over FireWire on device %016llx\n",
+                  net->name, (unsigned long long)card->guid);
  have_dev:
         ret = fwnet_add_peer(dev, unit, device);
         if (ret && allocated_netdev) {
@@ -1652,7 +1657,7 @@ static const struct ieee1394_device_id fwnet_id_table[] = {
 static struct fw_driver fwnet_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
-                .name   = KBUILD_MODNAME,
+                .name   = "net",
                 .bus    = &fw_bus_type,
                 .probe  = fwnet_probe,
                 .remove = fwnet_remove,