From: Clemens Ladisch <clemens@ladisch.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Peter Hurley <peter@hurleysoftware.com>
Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>,
devel@driverdev.osuosl.org,
linux1394-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org
Subject: [PATCH] staging/fwserial: use correct vendor/version IDs
Date: Wed, 28 Jan 2015 21:07:43 +0100 [thread overview]
Message-ID: <54C9418F.1050600@ladisch.de> (raw)
In-Reply-To: <54C940E0.5090906@ladisch.de>
The driver was using the vendor ID 0xd00d1e from the FireWire core.
However, this ID was not registered, and invalid.
Instead, use the vendor/version IDs that now are officially assigned to
firewire-serial:
https://ieee1394.wiki.kernel.org/index.php/IEEE_OUI_Assignments
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
---
drivers/staging/fwserial/TODO | 5 ++---
drivers/staging/fwserial/fwserial.c | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/fwserial/TODO b/drivers/staging/fwserial/TODO
index 382a795..c3d1d3a 100644
--- a/drivers/staging/fwserial/TODO
+++ b/drivers/staging/fwserial/TODO
@@ -9,6 +9,5 @@ TODOs prior to this driver moving out of staging
GUID-to-port matching/whitelist/blacklist.
-- Issues with firewire stack --
-1. This driver uses the same unregistered vendor id that the firewire core does
- (0xd00d1e). Perhaps this could be exposed as a define in
- firewire.h?
+1. This driver uses the same ids that the firewire core does (001f11:0239xx).
+ Perhaps this could be exposed as a define in firewire.h?
diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c
index 73deae3..2964366 100644
--- a/drivers/staging/fwserial/fwserial.c
+++ b/drivers/staging/fwserial/fwserial.c
@@ -30,8 +30,8 @@
#define be32_to_u64(hi, lo) ((u64)be32_to_cpu(hi) << 32 | be32_to_cpu(lo))
-#define LINUX_VENDOR_ID 0xd00d1eU /* same id used in card root directory */
-#define FWSERIAL_VERSION 0x00e81cU /* must be unique within LINUX_VENDOR_ID */
+#define LINUX_VENDOR_ID 0x001f11U /* same id used in card root directory */
+#define FWSERIAL_VERSION 0x023953U /* must be unique within LINUX_VENDOR_ID */
/* configurable options */
static int num_ttys = 4; /* # of std ttys to create per fw_card */
next parent reply other threads:[~2015-01-28 20:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <54C940E0.5090906@ladisch.de>
2015-01-28 20:07 ` Clemens Ladisch [this message]
2015-01-29 9:44 ` [PATCH] staging/fwserial: use correct vendor/version IDs Stefan Richter
2015-02-02 22:08 ` Peter Hurley
2015-02-03 8:44 ` Stefan Richter
2015-02-03 14:00 ` Peter Hurley
2015-02-03 21:22 ` Stefan Richter
2015-02-07 9:10 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54C9418F.1050600@ladisch.de \
--to=clemens@ladisch.de \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux1394-devel@lists.sourceforge.net \
--cc=peter@hurleysoftware.com \
--cc=stefanr@s5r6.in-berlin.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox