From c4cb296205de31438afb4dda4dfbfd56cfff9b99 Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Thu, 1 Dec 2005 18:52:01 -0500
Subject: [PATCH] --- yaml --- r: 15409 b: refs/heads/master c:
 546513f9fd96cba613cc2d025ee03d32d79394b7 h: refs/heads/master i:   15407:
 d509177e3478e010afcfad75d38bc44401cf9152 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/ieee1394/ieee1394_core.c | 21 ++++++---------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 3bb0ac814363..a0c238963a6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7758461b9a8253f1c125e5907579e0594d29e3b
+refs/heads/master: 546513f9fd96cba613cc2d025ee03d32d79394b7
diff --git a/trunk/drivers/ieee1394/ieee1394_core.c b/trunk/drivers/ieee1394/ieee1394_core.c
index f2f5e4805b5f..ff8a40980607 100644
--- a/trunk/drivers/ieee1394/ieee1394_core.c
+++ b/trunk/drivers/ieee1394/ieee1394_core.c
@@ -463,6 +463,7 @@ void hpsb_packet_sent(struct hpsb_host *host, struct hpsb_packet *packet,
 int hpsb_send_phy_config(struct hpsb_host *host, int rootid, int gapcnt)
 {
 	struct hpsb_packet *packet;
+	quadlet_t d = 0;
 	int retval = 0;
 
 	if (rootid >= ALL_NODES || rootid < -1 || gapcnt > 0x3f || gapcnt < -1 ||
@@ -472,26 +473,16 @@ int hpsb_send_phy_config(struct hpsb_host *host, int rootid, int gapcnt)
 		return -EINVAL;
 	}
 
-	packet = hpsb_alloc_packet(0);
-	if (!packet)
-		return -ENOMEM;
-
-	packet->host = host;
-	packet->header_size = 8;
-	packet->data_size = 0;
-	packet->expect_response = 0;
-	packet->no_waiter = 0;
-	packet->type = hpsb_raw;
-	packet->header[0] = 0;
 	if (rootid != -1)
-		packet->header[0] |= rootid << 24 | 1 << 23;
+		d |= PHYPACKET_PHYCONFIG_R | rootid << PHYPACKET_PORT_SHIFT;
 	if (gapcnt != -1)
-		packet->header[0] |= gapcnt << 16 | 1 << 22;
+		d |= PHYPACKET_PHYCONFIG_T | gapcnt << PHYPACKET_GAPCOUNT_SHIFT;
 
-	packet->header[1] = ~packet->header[0];
+	packet = hpsb_make_phypacket(host, d);
+	if (!packet)
+		return -ENOMEM;
 
 	packet->generation = get_hpsb_generation(host);
-
 	retval = hpsb_send_packet_and_wait(packet);
 	hpsb_free_packet(packet);