Linus, please pull from the for-linus branch at
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus
to receive the following IEEE 1394/ FireWire subsystem updates:
- a few small fixes,
- a new sysfs attribute for simpler and saner udev rules,
- preparations to add more drivers to the newer firewire stack
(mostly just header reorganization and file renames, as obvious in
the diffstat).
Admittedly, more than half of the commits are from June, but it's not
much and not complex and was successfully exposed to linux-next as long
as possible.
There is one firewire-sbp2 change in Greg's driver core pull request,
but git will merge it correctly regardless of the merge order.
Stefan Richter (14):
firewire: core: improve check for local node
firewire: core: check for missing struct update at build time, not run time
firewire: core: add sysfs attribute for easier udev rules
firewire: share device ID table type with ieee1394
firewire: also use vendor ID in root directory for driver matches
firewire: ohci: access bus_seconds atomically
firewire: clean up includes
firewire: reorganize header files
firewire: rename source files
firewire: add parent-of-unit accessor
firewire: core: include linux/uaccess.h instead of asm/uaccess.h
firewire: core: prepare for non-core children of card devices
firewire: core: don't update Broadcast_Channel if RFC 2734 conditions aren't met
firewire: core: use more outbound tlabels
drivers/firewire/Makefile | 8 +-
drivers/firewire/{fw-card.c => core-card.c} | 25 +-
drivers/firewire/{fw-cdev.c => core-cdev.c} | 13 +-
drivers/firewire/{fw-device.c => core-device.c} | 154 ++++++-
drivers/firewire/{fw-iso.c => core-iso.c} | 6 +-
.../firewire/{fw-topology.c => core-topology.c} | 24 +-
.../{fw-transaction.c => core-transaction.c} | 42 ++-
drivers/firewire/core.h | 293 +++++++++++++
drivers/firewire/fw-device.h | 202 ---------
drivers/firewire/fw-topology.h | 77 ----
drivers/firewire/fw-transaction.h | 446 --------------------
drivers/firewire/{fw-ohci.c => ohci.c} | 19 +-
drivers/firewire/{fw-ohci.h => ohci.h} | 6 +-
drivers/firewire/{fw-sbp2.c => sbp2.c} | 58 ++-
include/linux/firewire.h | 358 ++++++++++++++++
15 files changed, 902 insertions(+), 829 deletions(-)
rename drivers/firewire/{fw-card.c => core-card.c} (97%)
rename drivers/firewire/{fw-cdev.c => core-cdev.c} (99%)
rename drivers/firewire/{fw-device.c => core-device.c} (88%)
rename drivers/firewire/{fw-iso.c => core-iso.c} (99%)
rename drivers/firewire/{fw-topology.c => core-topology.c} (97%)
rename drivers/firewire/{fw-transaction.c => core-transaction.c} (97%)
create mode 100644 drivers/firewire/core.h
delete mode 100644 drivers/firewire/fw-device.h
delete mode 100644 drivers/firewire/fw-topology.h
delete mode 100644 drivers/firewire/fw-transaction.h
rename drivers/firewire/{fw-ohci.c => ohci.c} (99%)
rename drivers/firewire/{fw-ohci.h => ohci.h} (98%)
rename drivers/firewire/{fw-sbp2.c => sbp2.c} (97%)
create mode 100644 include/linux/firewire.h
Thanks,
--
Stefan Richter
-=====-==--= -==- =----
http://arcgraph.de/sr/
Linus, please pull from the for-linus branch at
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus
to receive the following IEEE 1394/ FireWire subsystem updates.
The shortlog says it all --- drivers/firewire gains IPv4 support and is
no longer considered experimental.
The "new" firewire stack is now preferable over the older ieee1394 stack
*except for audio devices* (FireWire audio devices for sound studios,
driven by the FFADO + Jack userspace framework), and for FireWire DVB
boxes driven by the firedtv kernel driver (to be adapted to the new
firewire stack RSN). Distributors who like to utilize the enhanced
features, performance, and security of the new stack but also want to
support pro/ semi-pro FireWire audio and FireWire DVB too can easily
package both the old and the new stack. Some more info is provided via
the Kconfig help text.
The code in this form has been in linux-next for merely a week, even
though the bulk of it was supplied to linux1394-devel in May. Sorry for
my being slow to line it up.
Jay Fenlason (1):
firewire: add IPv4 support
Stefan Richter (10):
firewire: net: add Kconfig item, rename driver
firewire: net: style changes
firewire: net: allow for unordered unit discovery
firewire: net: remove unused code
firewire: net: adjust net_device ops
firewire: core: fix DMA unmapping in iso buffer removal
firewire: core: fix iso context shutdown on card removal
firewire: net: fix card driver reloading
firewire: net: better FIFO address range check and rcodes
firewire: new stack is no longer experimental
drivers/firewire/Kconfig | 60 +-
drivers/firewire/Makefile | 4 +-
drivers/firewire/core-card.c | 20 +-
drivers/firewire/core-iso.c | 11 +-
drivers/firewire/core.h | 87 ---
drivers/firewire/net.c | 1655 ++++++++++++++++++++++++++++++++++++++++++
drivers/ieee1394/Kconfig | 19 +-
include/linux/firewire.h | 87 +++
8 files changed, 1807 insertions(+), 136 deletions(-)
create mode 100644 drivers/firewire/net.c
Thanks,
--
Stefan Richter
-=====-==--= -==- =-==-
http://arcgraph.de/sr/