into modernduck.com:/usr/src/bk/1394-2.6

Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Signed-off-by: Ben Collins <bcollins@debian.org>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

is called from raw1394.c:arm_register().
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Signed-off-by: Jody McIntyre <scjody@modernduck.com>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into intel.com:/home/lenb/src/26-latest-dev

Signed-off-by: Len Brown <len.brown@intel.com>

reorganise LUN handling to resolve oops
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Adds a disable_irm option to ieee1394.ko which disables all Isochronous
Resource Manager functionality, useful to work around certain problems,
e.g. iPod detection.
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

bugfix for logical unit directory lun number
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

enclosures -- while not breaking Logical Unit Directory.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Fixed removal of old partial datagrams.  Since max_partial_datagrams can
be changed at runtime, there may be _more_ than max_partial_datagrams
in the list.  Also removed obsolote comment.
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

dma.c vfree() checking cleanups.

Signed-off by: James Lamanna <jlamanna@gmail.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Sets the sendtime of a packet _before_ adding it to pending_packet_queue,
to prevent premature expiry (which leads to "unsolicited response packet"
errors, among other things).
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

We need to update the old csr1212 cache's bus generation after a bus
reset once we decide it is still valid.
Closes a vmalloc leak on *every* bus reset.
Signed-off-by: Jim Radford <radford@indigita.com>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

This closes a small vmalloc leak on insmod/rmmod.
Signed-off-by: Jim Radford <radford@indigita.com>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Dan Dennedy:

Ignore any return value from devfs since it is non-critical, and a
EEXIST return prevents the module from loading!
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Move simple class to ieee1394 core and register as
/sys/class/ieee1394_protocol.
Add sysfs/udev support to video1394 and dv1394 using simple class
ieee1394_protocol.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Adds basic sysfs support for udev etc.
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Change some variables and functions that were needlessly global static.
Removes several functions that weren't used anywhere in the kernel.
Removes many unnecessary EXPORT_SYMBOL's.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Fixes a bug in the channel reservation :
If dma resources allocation fails, the channel was not freed.  I fixed
that by marking the channel allocated after the dma resources allocation
succeeded.  Also changed the error return value from ioctl.

Signed-off-by: Philippe De Muyter <phdm at macqel dot be>
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

into intel.com:/home/lenb/src/26-latest-dev

Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

into intel.com:/home/lenb/src/26-latest-dev

I have tested and updated a patch from Randy Dunlap that fixes missing
entries in the modules.ieee1394map file. The patch is against latest SVN
(1234).

The patch adds the following entries for IIDC cameras that would not be
detected otherwise:

video1394            0x0000000c  0x000000  0x000000 0x00a02d     0x000101
video1394            0x0000000c  0x000000  0x000000 0x00a02d     0x000102
raw1394              0x0000000c  0x000000  0x000000 0x00a02d     0x000101
raw1394              0x0000000c  0x000000  0x000000 0x00a02d     0x000102

This is necessary because the IIDC consortium interpreted the 1394
specifications differently. They have been summoned by the 1394TA to
change their numbering policy so that these entries are final and will
not grow forever in number.
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

In trunk/ohci1394.c, duplicate code has slipped in which sets 
max_packet_size to 512 and prints a log notice. See "Serial EEPROM 
Sanity check" further down in ohci_initialize(). Since the latter code 
is more appropriate, the former is deleted by the attached patch.
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

drivers/ieee1394/raw1394.c::raw1394_read() with the added bonus of
silencing this warning:
include/asm/uaccess.h: In function `raw1394_read':
drivers/ieee1394/raw1394.c:446: warning: ignoring return value of `__copy_to_user', declared with attribute warn_unused_result

I've submitted this before, but never got an ACK or NACK, and the patch is
still relevant against latest Linus bk (2.6.10-rc2-bk11 atm).
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

sw-suspend does not work with our kernel.
khpsbpkt will die because down_interruptible returns -EINTR on suspend.
As a result, hpsb packet delivery will not work anymore after resume.
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Signed-off-by: Jody McIntyre <scjody@modernduck.com>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

The function returns before recalculating the checksum in some cases.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Same fix as per ipv4 ip_copy_metadata().
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Netfilter conntrack can defragment locally generated
packets before they hit ip_fragment().  In this case
the fragments have skb->dst set already, so we have to
release that existing reference before overwriting
skb->dst.
Signed-off-by: David S. Miller <davem@davemloft.net>

into nuts.davemloft.net:/disk1/BK/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux