Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / firewire / core-cdev.c

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 14bb7b7b5dd7bda6e4d98b9066937212c70043d0..48ae712e21018e64cca840b3e146b728bda72f99 100644 (file)
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -1501,9 +1501,10 @@ static int ioctl_send_phy_packet(struct client *client, union ioctl_arg *arg)
        e->client               = client;
        e->p.speed              = SCODE_100;
        e->p.generation         = a->generation;
-       e->p.header[0]          = a->data[0];
-       e->p.header[1]          = a->data[1];
-       e->p.header_length      = 8;
+       e->p.header[0]          = TCODE_LINK_INTERNAL << 4;
+       e->p.header[1]          = a->data[0];
+       e->p.header[2]          = a->data[1];
+       e->p.header_length      = 12;
        e->p.callback           = outbound_phy_packet_callback;
        e->phy_packet.closure   = a->closure;
        e->phy_packet.type      = FW_CDEV_EVENT_PHY_PACKET_SENT;