Merge branch 'linus' into core/softlockup

[mirror_ubuntu-hirsute-kernel.git] / drivers / infiniband / hw / nes / nes.c

diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index b046262ed638114bb8ce8c3d64ff9dd22267a62b..d2884e7780987c2a9f5ee9ad409086100127ba25 100644 (file)
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -139,8 +139,9 @@ static int nes_inetaddr_event(struct notifier_block *notifier,
 
        addr = ntohl(ifa->ifa_address);
        mask = ntohl(ifa->ifa_mask);
-       nes_debug(NES_DBG_NETDEV, "nes_inetaddr_event: ip address %08X, netmask %08X.\n",
-                       addr, mask);
+       nes_debug(NES_DBG_NETDEV, "nes_inetaddr_event: ip address " NIPQUAD_FMT
+                 ", netmask " NIPQUAD_FMT ".\n",
+                 HIPQUAD(addr), HIPQUAD(mask));
        list_for_each_entry(nesdev, &nes_dev_list, list) {
                nes_debug(NES_DBG_NETDEV, "Nesdev list entry = 0x%p. (%s)\n",
                                nesdev, nesdev->netdev[0]->name);
@@ -327,7 +328,7 @@ void nes_rem_ref(struct ib_qp *ibqp)
                set_wqe_32bit_value(cqp_wqe->wqe_words, NES_CQP_WQE_ID_IDX, nesqp->hwqp.qp_id);
                u64temp = (u64)nesqp->nesqp_context_pbase;
                set_wqe_64bit_value(cqp_wqe->wqe_words, NES_CQP_QP_WQE_CONTEXT_LOW_IDX, u64temp);
-               nes_post_cqp_request(nesdev, cqp_request, NES_CQP_REQUEST_RING_DOORBELL);
+               nes_post_cqp_request(nesdev, cqp_request);
        }
 }
 
@@ -353,13 +354,11 @@ struct ib_qp *nes_get_qp(struct ib_device *device, int qpn)
  */
 static void nes_print_macaddr(struct net_device *netdev)
 {
-       nes_debug(NES_DBG_INIT, "%s: MAC %02X:%02X:%02X:%02X:%02X:%02X, IRQ %u\n",
-                       netdev->name,
-                       netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
-                       netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5],
-                       netdev->irq);
-}
+       DECLARE_MAC_BUF(mac);
 
+       nes_debug(NES_DBG_INIT, "%s: %s, IRQ %u\n",
+                 netdev->name, print_mac(mac, netdev->dev_addr), netdev->irq);
+}
 
 /**
  * nes_interrupt - handle interrupts