linux/drivers/atm, branch v3.8.1

atm/iphase: rename fregt_t -> ffreg_t

2013-02-08T19:22:05Z

We have conflicting type qualifiers for "freg_t" in s390's ptrace.h and the iphase atm device driver, which causes the compile error below. Unfortunately the s390 typedef can't be renamed, since it's a user visible api, nor can I change the include order in s390 code to avoid the conflict. So simply rename the iphase typedef to a new name. Fixes this compile error: In file included from drivers/atm/iphase.c:66:0: drivers/atm/iphase.h:639:25: error: conflicting type qualifiers for 'freg_t' In file included from next/arch/s390/include/asm/ptrace.h:9:0, from next/arch/s390/include/asm/lowcore.h:12, from next/arch/s390/include/asm/thread_info.h:30, from include/linux/thread_info.h:54, from include/linux/preempt.h:9, from include/linux/spinlock.h:50, from include/linux/seqlock.h:29, from include/linux/time.h:5, from include/linux/stat.h:18, from include/linux/module.h:10, from drivers/atm/iphase.c:43: next/arch/s390/include/uapi/asm/ptrace.h:197:3: note: previous declaration of 'freg_t' was here Signed-off-by: Heiko Carstens Acked-by: chas williams - CONTRACTOR Signed-off-by: David S. Miller

Drivers: atm: remove __dev* attributes.

2013-01-03T23:57:04Z

CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed. This change removes the use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit from these drivers. Based on patches originally written by Bill Pemberton, but redone by me in order to handle some of the coding style issues better, by hand. Cc: Bill Pemberton Cc: Chas Williams Signed-off-by: Greg Kroah-Hartman

solos-pci: double lock in geos_gpio_store()

2012-12-21T21:14:00Z

There is a typo here so we do a double lock instead of an unlock. Signed-off-by: Dan Carpenter Acked-by: David Woodhouse Signed-off-by: David S. Miller

solos-pci: ensure all TX packets are aligned to 4 bytes

2012-12-19T22:53:53Z

The FPGA can't handled unaligned DMA (yet). So copy into an aligned buffer, if skb->data isn't suitably aligned. Signed-off-by: David Woodhouse Signed-off-by: David S. Miller

solos-pci: add firmware upgrade support for new models

2012-12-19T22:53:53Z

Signed-off-by: Nathan Williams Signed-off-by: David Woodhouse Signed-off-by: David S. Miller

solos-pci: remove superfluous debug output

2012-12-19T22:53:53Z

Signed-off-by: Nathan Williams Signed-off-by: David Woodhouse Signed-off-by: David S. Miller

solos-pci: add GPIO support for newer versions on Geos board

2012-12-19T22:53:53Z

dwmw2: Tidy up a little, simpler matching on which GPIO is being accessed, only register on newer boards, register under PCI device instead of duplicating them under each ATM device. Signed-off-by: Nathan Williams Signed-off-by: David Woodhouse Signed-off-by: David S. Miller

solos-pci: fix double-free of TX skb in DMA mode

2012-12-12T05:16:47Z

We weren't clearing card->tx_skb[port] when processing the TX done interrupt. If there wasn't another skb ready to transmit immediately, this led to a double-free because we'd free it *again* next time we did have a packet to send. Signed-off-by: David Woodhouse Cc: stable@kernel.org Signed-off-by: David S. Miller

Merge git://git.infradead.org/users/dwmw2/atm

2012-12-02T01:45:24Z

David Woodhouse says: ==================== This is the result of pulling on the thread started by Krzysztof Mazur's original patch 'pppoatm: don't send frames to destroyed vcc'. Various problems in the pppoatm and br2684 code are solved, some of which were easily triggered and would panic the kernel. ==================== Signed-off-by: David S. Miller

solos-pci: remove list_vccs() debugging function

2012-12-02T00:06:18Z

No idea why we've gone so long dumping a list of VCCs with vci==0 on every ->open() call... Signed-off-by: David Woodhouse