diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2010-11-30 08:24:47 +0100 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-12-13 20:39:14 +0100 |
commit | 5b06db166c4d38638980283505259fa165d4f369 (patch) | |
tree | 3384d55b420987325ffabf523ded740b1daac2c4 /drivers/firewire/core-cdev.c | |
parent | 8327b37b18addfc6f8cf41a2f1a4490b656377b9 (diff) | |
download | linux-stable-5b06db166c4d38638980283505259fa165d4f369.tar.gz linux-stable-5b06db166c4d38638980283505259fa165d4f369.tar.bz2 linux-stable-5b06db166c4d38638980283505259fa165d4f369.zip |
firewire: make PHY packet header format consistent
Change the header of PHY packets to be sent to include a pseudo
transaction code. This makes the header consistent with that of
received PHY packets, and allows at_context_queue_packet() and
log_ar_at_event() to see the packet type directly instead of having
to deduce it from the header length or even from the header contents.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/core-cdev.c')
-rw-r--r-- | drivers/firewire/core-cdev.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index 14bb7b7b5dd7..48ae712e2101 100644 --- 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; |