]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 9 Nov 2011 00:52:34 +0000 (11:52 +1100)]
Merge remote-tracking branch 'sound/for-next'

13 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 9 Nov 2011 00:51:07 +0000 (11:51 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

13 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 9 Nov 2011 00:49:45 +0000 (11:49 +1100)]
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
include/net/bluetooth/bluetooth.h
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c

13 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 9 Nov 2011 00:48:01 +0000 (11:48 +1100)]
Merge remote-tracking branch 'wireless-next/master'

13 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 9 Nov 2011 00:45:35 +0000 (11:45 +1100)]
Merge remote-tracking branch 'net-next/master'

13 years agoMerge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Wed, 9 Nov 2011 00:44:07 +0000 (11:44 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'

13 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Wed, 9 Nov 2011 00:43:51 +0000 (11:43 +1100)]
Merge remote-tracking branch 'ibft/master'

13 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Wed, 9 Nov 2011 00:43:46 +0000 (11:43 +1100)]
Merge remote-tracking branch 'swiotlb/master'

Conflicts:
drivers/xen/swiotlb-xen.c

13 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 9 Nov 2011 00:42:01 +0000 (11:42 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

13 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Wed, 9 Nov 2011 00:41:56 +0000 (11:41 +1100)]
Merge remote-tracking branch 'kconfig/for-next'

13 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 9 Nov 2011 00:41:48 +0000 (11:41 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

13 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 9 Nov 2011 00:38:28 +0000 (11:38 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

13 years agoMerge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Wed, 9 Nov 2011 00:37:09 +0000 (11:37 +1100)]
Merge remote-tracking branch 'docs/docs-move'

13 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Wed, 9 Nov 2011 00:35:48 +0000 (11:35 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c

13 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Wed, 9 Nov 2011 00:34:28 +0000 (11:34 +1100)]
Merge branch 'quilt/i2c'

13 years agoMerge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Wed, 9 Nov 2011 00:31:28 +0000 (11:31 +1100)]
Merge remote-tracking branch 'pci/linux-next'

13 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 9 Nov 2011 00:30:00 +0000 (11:30 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

Conflicts:
fs/ocfs2/xattr.c

13 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 9 Nov 2011 00:28:35 +0000 (11:28 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

13 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 9 Nov 2011 00:27:16 +0000 (11:27 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

13 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 9 Nov 2011 00:25:59 +0000 (11:25 +1100)]
Merge remote-tracking branch 'logfs/master'

Conflicts:
fs/logfs/file.c

13 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 9 Nov 2011 00:24:31 +0000 (11:24 +1100)]
Merge remote-tracking branch 'gfs2/master'

13 years agoMerge remote-tracking branch 'cifs/master'
Stephen Rothwell [Wed, 9 Nov 2011 00:23:09 +0000 (11:23 +1100)]
Merge remote-tracking branch 'cifs/master'

13 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Wed, 9 Nov 2011 00:21:49 +0000 (11:21 +1100)]
Merge remote-tracking branch 'xtensa/master'

13 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 9 Nov 2011 00:20:30 +0000 (11:20 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

13 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 9 Nov 2011 00:19:12 +0000 (11:19 +1100)]
Merge remote-tracking branch 's390/features'

13 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Wed, 9 Nov 2011 00:18:56 +0000 (11:18 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

13 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Wed, 9 Nov 2011 00:17:34 +0000 (11:17 +1100)]
Merge remote-tracking branch 'parisc/for-next'

13 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 9 Nov 2011 00:16:17 +0000 (11:16 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

13 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 9 Nov 2011 00:14:56 +0000 (11:14 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/Kconfig
arch/m68k/kernel/Makefile

13 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Tue, 8 Nov 2011 23:55:05 +0000 (10:55 +1100)]
Merge remote-tracking branch 'ia64/next'

13 years agoMerge branch 'quilt/hexagon'
Stephen Rothwell [Tue, 8 Nov 2011 23:55:03 +0000 (10:55 +1100)]
Merge branch 'quilt/hexagon'

Conflicts:
arch/hexagon/Makefile
arch/hexagon/include/asm/Kbuild
arch/hexagon/include/asm/timex.h
arch/hexagon/include/asm/vdso.h
arch/hexagon/kernel/Makefile
arch/hexagon/kernel/head.S
arch/hexagon/kernel/hexagon_ksyms.c
arch/hexagon/kernel/kgdb.c
arch/hexagon/kernel/vdso.c
arch/hexagon/kernel/vm_vectors.S
arch/hexagon/kernel/vmlinux.lds.S
arch/hexagon/lib/memset.S
arch/hexagon/mm/Makefile
arch/hexagon/mm/pgalloc.c
arch/hexagon/mm/strnlen_user.S

13 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 8 Nov 2011 23:46:26 +0000 (10:46 +1100)]
Merge remote-tracking branch 'cris/for-next'

13 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Tue, 8 Nov 2011 23:41:08 +0000 (10:41 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

13 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Tue, 8 Nov 2011 23:39:53 +0000 (10:39 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'

13 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 8 Nov 2011 23:38:34 +0000 (10:38 +1100)]
Merge remote-tracking branch 'tegra/for-next'

13 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Tue, 8 Nov 2011 23:37:19 +0000 (10:37 +1100)]
Merge remote-tracking branch 's5p/for-next'

13 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Tue, 8 Nov 2011 23:35:57 +0000 (10:35 +1100)]
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mx5/mm.c
arch/arm/plat-mxc/include/mach/hardware.h

13 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Tue, 8 Nov 2011 23:34:28 +0000 (10:34 +1100)]
Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
drivers/ata/pata_at91.c

13 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Tue, 8 Nov 2011 23:33:01 +0000 (10:33 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'

13 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 8 Nov 2011 23:31:48 +0000 (10:31 +1100)]
Merge remote-tracking branch 'arm/for-next'

13 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Tue, 8 Nov 2011 23:27:46 +0000 (10:27 +1100)]
Merge remote-tracking branch 'ide/master'

13 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Tue, 8 Nov 2011 23:27:40 +0000 (10:27 +1100)]
Merge remote-tracking branch 'crypto-current/master'

13 years agoMerge remote-tracking branch 'md-current/for-linus'
Stephen Rothwell [Tue, 8 Nov 2011 23:27:31 +0000 (10:27 +1100)]
Merge remote-tracking branch 'md-current/for-linus'

13 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Tue, 8 Nov 2011 23:27:25 +0000 (10:27 +1100)]
Merge remote-tracking branch 'input-current/for-linus'

13 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Tue, 8 Nov 2011 23:27:22 +0000 (10:27 +1100)]
Merge remote-tracking branch 'wireless/master'

13 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Tue, 8 Nov 2011 23:27:20 +0000 (10:27 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'

13 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Tue, 8 Nov 2011 23:27:19 +0000 (10:27 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

13 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Tue, 8 Nov 2011 23:27:19 +0000 (10:27 +1100)]
Merge remote-tracking branch 'net/master'

13 years agoMerge remote-tracking branch 'powerpc-merge/merge'
Stephen Rothwell [Tue, 8 Nov 2011 23:27:16 +0000 (10:27 +1100)]
Merge remote-tracking branch 'powerpc-merge/merge'

13 years agoMerge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Tue, 8 Nov 2011 23:27:15 +0000 (10:27 +1100)]
Merge remote-tracking branch 'm68k-current/for-linus'

13 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Tue, 8 Nov 2011 23:27:15 +0000 (10:27 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

13 years agoMerge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Linus Torvalds [Tue, 8 Nov 2011 22:24:18 +0000 (14:24 -0800)]
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR())
  PM / devfreq: fix private_data
  Documentation: Fix typo in freezer-subsystem.txt
  PM / QoS: Set cpu_dma_pm_qos->name

13 years agonet: rename sk_clone to sk_clone_lock
Eric Dumazet [Tue, 8 Nov 2011 22:07:07 +0000 (17:07 -0500)]
net: rename sk_clone to sk_clone_lock

Make clear that sk_clone() and inet_csk_clone() return a locked socket.

Add _lock() prefix and kerneldoc.

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agosch_choke: use skb_header_pointer()
Eric Dumazet [Tue, 8 Nov 2011 10:45:04 +0000 (10:45 +0000)]
sch_choke: use skb_header_pointer()

Remove the assumption that skb_get_rxhash() makes IP header and ports
linear, and use skb_header_pointer() instead in choke_match_flow()

This permits __skb_get_rxhash() to use skb_header_pointer() eventually.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agom68k/mac: Remove mac_irq_{en,dis}able() wrappers
Finn Thain [Sun, 11 Sep 2011 13:40:50 +0000 (23:40 +1000)]
m68k/mac: Remove mac_irq_{en,dis}able() wrappers

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k/irq: Remove obsolete support for user vector interrupt fixups
Geert Uytterhoeven [Sun, 11 Sep 2011 09:54:50 +0000 (11:54 +0200)]
m68k/irq: Remove obsolete support for user vector interrupt fixups

It was used on Apollo only, before its conversion to genirq.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k/irq: Remove obsolete m68k irq framework
Geert Uytterhoeven [Sun, 11 Sep 2011 09:28:04 +0000 (11:28 +0200)]
m68k/irq: Remove obsolete m68k irq framework

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k/q40: Convert Q40/Q60 to genirq
Geert Uytterhoeven [Thu, 18 Aug 2011 12:47:16 +0000 (14:47 +0200)]
m68k/q40: Convert Q40/Q60 to genirq

q40_irq_handler() must be kept to translate ISA IRQs to the range 1-15.
q40_probe_irq_o{ff,n}() become unused.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Richard Zidlicky <rz@linux-m68k.org>
13 years agom68k/sun3: Convert Sun3/3x to genirq
Geert Uytterhoeven [Thu, 18 Aug 2011 12:46:46 +0000 (14:46 +0200)]
m68k/sun3: Convert Sun3/3x to genirq

Replace the custom irq handler that masks the irq and calls do_IRQ(), and
the unmasking in the individual handlers, by handle_level_irq().

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Sam Creasey <sammy@sammy.net>
13 years agom68k/sun3: Use the kstat_irqs_cpu() wrapper
Geert Uytterhoeven [Thu, 18 Aug 2011 20:46:01 +0000 (22:46 +0200)]
m68k/sun3: Use the kstat_irqs_cpu() wrapper

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Sam Creasey <sammy@sammy.net>
13 years agom68k/apollo: Convert Apollo to genirq
Geert Uytterhoeven [Thu, 18 Aug 2011 12:45:57 +0000 (14:45 +0200)]
m68k/apollo: Convert Apollo to genirq

Replace the custom user vector interrupt handler that calls do_IRQ() and
does an EOI by handle_fasteoi_irq().

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Peter De Schrijver <p2@debian.org>
13 years agom68k/vme: Convert VME to genirq
Geert Uytterhoeven [Sat, 13 Aug 2011 19:11:00 +0000 (21:11 +0200)]
m68k/vme: Convert VME to genirq

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Richard Hirst <rhirst@parisc-linux.org>
13 years agom68k/hp300: Convert HP9000/300 and HP9000/400 to genirq
Geert Uytterhoeven [Sat, 13 Aug 2011 19:02:22 +0000 (21:02 +0200)]
m68k/hp300: Convert HP9000/300 and HP9000/400 to genirq

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Philip Blundell <philb@gnu.org>
13 years agom68k/mac: Optimize interrupts using chain handlers
Geert Uytterhoeven [Wed, 10 Aug 2011 10:48:29 +0000 (12:48 +0200)]
m68k/mac: Optimize interrupts using chain handlers

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k/mac: Convert Mac to genirq
Geert Uytterhoeven [Wed, 13 Jul 2011 19:48:30 +0000 (21:48 +0200)]
m68k/mac: Convert Mac to genirq

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k/amiga: Optimize interrupts using chain handlers
Geert Uytterhoeven [Wed, 1 Jun 2011 09:49:18 +0000 (11:49 +0200)]
m68k/amiga: Optimize interrupts using chain handlers

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k/amiga: Convert Amiga to genirq
Geert Uytterhoeven [Tue, 31 May 2011 20:08:28 +0000 (22:08 +0200)]
m68k/amiga: Convert Amiga to genirq

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k/amiga: Refactor amiints.c
Geert Uytterhoeven [Tue, 31 May 2011 09:11:01 +0000 (11:11 +0200)]
m68k/amiga: Refactor amiints.c

  - Remove filename in comments,
  - Reorder functions so we no longer need forward declarations.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k/atari: Remove code and comments about different irq types
Geert Uytterhoeven [Thu, 18 Aug 2011 17:36:30 +0000 (19:36 +0200)]
m68k/atari: Remove code and comments about different irq types

This code was obsoleted during the irq restructuring in 2006.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k/atari: Convert Atari to genirq
Geert Uytterhoeven [Fri, 29 Apr 2011 21:35:21 +0000 (23:35 +0200)]
m68k/atari: Convert Atari to genirq

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
[v1] Acked-by: Thomas Gleixner <tglx@linutronix.de>

13 years agom68k/irq: Add genirq support
Geert Uytterhoeven [Thu, 21 Apr 2011 20:50:52 +0000 (22:50 +0200)]
m68k/irq: Add genirq support

Disabled on all platforms for now

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
[v1] Acked-by: Thomas Gleixner <tglx@linutronix.de>

13 years agom68k/irq: Remove obsolete IRQ_FLG_* users
Geert Uytterhoeven [Wed, 13 Jul 2011 20:33:13 +0000 (22:33 +0200)]
m68k/irq: Remove obsolete IRQ_FLG_* users

The m68k core irq code stopped honoring these flags during the irq
restructuring in 2006.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k/irq: Rename {,__}m68k_handle_int()
Geert Uytterhoeven [Fri, 1 Jul 2011 18:39:19 +0000 (20:39 +0200)]
m68k/irq: Rename {,__}m68k_handle_int()

  - Rename m68k_handle_int() to generic_handle_irq(), and drop the unneeded
    asmlinkage,
  - Rename __m68k_handle_int() to do_IRQ().

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k/irq: Add m68k_setup_irq_controller()
Geert Uytterhoeven [Wed, 1 Jun 2011 09:15:21 +0000 (11:15 +0200)]
m68k/irq: Add m68k_setup_irq_controller()

This is a wrapper around m68k_setup_irq_chip() that discards its dummy
second parameter, to ease the future transition to genirq.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k/irq: Extract irq_set_chip()
Geert Uytterhoeven [Fri, 27 May 2011 20:33:41 +0000 (22:33 +0200)]
m68k/irq: Extract irq_set_chip()

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
13 years agom68k/irq: Rename setup_irq() to m68k_setup_irq() and make it static
Geert Uytterhoeven [Tue, 19 Apr 2011 18:10:53 +0000 (20:10 +0200)]
m68k/irq: Rename setup_irq() to m68k_setup_irq() and make it static

It has nothing to do with the standard one in <linux/irq.h>

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
13 years agom68k/irq: Switch irq_chip methods to "struct irq_data *data"
Geert Uytterhoeven [Sun, 17 Apr 2011 20:53:04 +0000 (22:53 +0200)]
m68k/irq: Switch irq_chip methods to "struct irq_data *data"

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
13 years agom68k/irq: Rename irq_node to irq_data
Geert Uytterhoeven [Sun, 17 Apr 2011 19:59:23 +0000 (21:59 +0200)]
m68k/irq: Rename irq_node to irq_data

Make it more similar to the genirq version:
  - Add an irq field

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
13 years agom68k/irq: Kill irq_node_t typedef, always use struct irq_node
Geert Uytterhoeven [Sun, 17 Apr 2011 19:39:08 +0000 (21:39 +0200)]
m68k/irq: Kill irq_node_t typedef, always use struct irq_node

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
13 years agom68k/irq: Rename irq_controller to irq_chip
Geert Uytterhoeven [Wed, 13 Apr 2011 20:31:28 +0000 (22:31 +0200)]
m68k/irq: Rename irq_controller to irq_chip

Make it more similar to the genirq version:
  - Remove lock (unused as we don't do SMP anyway),
  - Prepend methods with irq_,
  - Make irq_startup() return unsigned int.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
13 years agoide-{cd,floppy,tape}: Do not include <linux/irq.h>
Geert Uytterhoeven [Wed, 25 May 2011 19:40:59 +0000 (21:40 +0200)]
ide-{cd,floppy,tape}: Do not include <linux/irq.h>

The top of <linux/irq.h> has this comment:

 * Please do not include this file in generic code.  There is currently
 * no requirement for any architecture to implement anything held
 * within this file.
 *
 * Thanks. --rmk

Remove inclusion of <linux/irq.h>, to prevent the following compile error
from happening soon:

| include/linux/irq.h:132: error: redefinition of ‘struct irq_data’
| include/linux/irq.h:286: error: redefinition of ‘struct irq_chip’

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Borislav Petkov <bp@alien8.de>
Cc: linux-ide@vger.kernel.org
13 years agom68k: Revive lost DIO bus config option
Geert Uytterhoeven [Fri, 28 Oct 2011 20:37:21 +0000 (22:37 +0200)]
m68k: Revive lost DIO bus config option

commit 0e152d80507b75c00aac60f2ffc586360687cd52 ("m68k: reorganize Kconfig
options to improve mmu/non-mmu selections") accidentally dropped the DIO
bus config option. Re-add it to the "Bus support" section.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
13 years agom68k: Revive lost ARAnyM config options
Geert Uytterhoeven [Tue, 25 Oct 2011 19:14:10 +0000 (21:14 +0200)]
m68k: Revive lost ARAnyM config options

commit 0e152d80507b75c00aac60f2ffc586360687cd52 ("m68k: reorganize Kconfig
options to improve mmu/non-mmu selections") accidentally dropped the ARAnyM
config options. Re-add them to the "Platform devices" section.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Greg Ungerer <gerg@uclinux.org>
13 years agoPM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR())
Thomas Meyer [Tue, 8 Nov 2011 21:34:00 +0000 (22:34 +0100)]
PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR())

Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...))

[The semantic patch that makes this change is available
 in scripts/coccinelle/api/err_cast.cocci.

 More information about semantic patching is available at
 http://coccinelle.lip6.fr/]

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
13 years agomac80211: allow frame aggregation for mesh
Thomas Pedersen [Wed, 26 Oct 2011 21:47:29 +0000 (14:47 -0700)]
mac80211: allow frame aggregation for mesh

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Ashok Nagarajan <anagar6@uic.edu>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: set HT capabilities for mesh peer
Thomas Pedersen [Wed, 26 Oct 2011 21:47:28 +0000 (14:47 -0700)]
mac80211: set HT capabilities for mesh peer

Set peer's HT capabilities, and disallow peering if we're on a different
channel type.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Ashok Nagarajan <anagar6@uic.edu>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: add HT IEs to mesh frames
Thomas Pedersen [Wed, 26 Oct 2011 21:47:27 +0000 (14:47 -0700)]
mac80211: add HT IEs to mesh frames

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Ashok Nagarajan <anagar6@uic.edu>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: Add HT helper functions
Alexander Simon [Wed, 26 Oct 2011 21:47:26 +0000 (14:47 -0700)]
mac80211: Add HT helper functions

Some refactoring for IBSS HT.

Move HT info and capability IEs building code into separate functions.

Add function to get the channel type from an HT info IE.

Signed-off-by: Alexander Simon <an.alexsimon@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: comment allocation of mesh frames
Thomas Pedersen [Wed, 26 Oct 2011 21:47:25 +0000 (14:47 -0700)]
mac80211: comment allocation of mesh frames

Remove most references to magic numbers, save a few bytes and hopefully
improve readability.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k_hw: Updated AR9462 initval table to improve rx performance
Rajkumar Manoharan [Tue, 25 Oct 2011 07:10:38 +0000 (12:40 +0530)]
ath9k_hw: Updated AR9462 initval table to improve rx performance

The initval tables are updated as per system team input to improve
rx performance and power accuracy at 5GHz.

Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k: Add btcoex profile management support for AR9462
Rajkumar Manoharan [Mon, 24 Oct 2011 12:49:49 +0000 (18:19 +0530)]
ath9k: Add btcoex profile management support for AR9462

AR9462 chips have the capabilities to provoide bluetooth
profile information. For non-AR9462 btcoex chips, the BT
priority traffic was identified by periodically polling
the respective registers and updated dutycycle, stomptype,
etc. As AR9462 chip offers the BT profile informations,
let us make use of that to update aggregation limit,
dutycycle, stomptype and wieghtages.

Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k_hw: Update CCK spur mitigation for AR9462
Rajkumar Manoharan [Mon, 24 Oct 2011 12:44:39 +0000 (18:14 +0530)]
ath9k_hw: Update CCK spur mitigation for AR9462

To improve CCK sensitivity for AR9462 chips, performing
spur mitigation at 2440, 2464 frequencies alone is sufficient.

Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211_hwsim: Claim support for TDLS
Jouni Malinen [Sun, 23 Oct 2011 19:45:27 +0000 (22:45 +0300)]
mac80211_hwsim: Claim support for TDLS

Signed-off-by: Jouni Malinen <j@w1.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: support adding IV-room in the skb for CCMP keys
Arik Nemtsov [Sun, 23 Oct 2011 06:21:41 +0000 (08:21 +0200)]
mac80211: support adding IV-room in the skb for CCMP keys

Some cards can generate CCMP IVs in HW, but require the space for the IV
to be pre-allocated in the frame at the correct offset. Add a key flag
that allows us to achieve this.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agonl80211: clean up genlmsg_end uses
Johannes Berg [Sat, 22 Oct 2011 17:05:51 +0000 (19:05 +0200)]
nl80211: clean up genlmsg_end uses

genlmsg_end() cannot fail, it just returns the length
of the message. Thus, error handling for it is useless.
While removing it, I also noticed a useless variable
and removed this it as well.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agobrcm80211: smac: change buffer endianess convert function interface
Arend van Spriel [Fri, 21 Oct 2011 14:16:35 +0000 (16:16 +0200)]
brcm80211: smac: change buffer endianess convert function interface

The buffer endianess conversion functions in srom.c had a size
argument giving number of bytes but the function converts words.
Providing the number of words to the function is more sensible
so that is done in this patch.

Reported-by: Pavel Roskin <proski@gnu.org>
Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agobrcm80211: fmac: remove state from brcmf_if in fullmac
Franky Lin [Fri, 21 Oct 2011 14:16:34 +0000 (16:16 +0200)]
brcm80211: fmac: remove state from brcmf_if in fullmac

The usage of state decrease readability. Optimize the code flow to
get rid of it

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agobrcm80211: fmac: store brcmf_if in net device private data
Franky Lin [Fri, 21 Oct 2011 14:16:33 +0000 (16:16 +0200)]
brcm80211: fmac: store brcmf_if in net device private data

Make a proper use of private data area of net device by storing
interface related data structure instead of generic driver data

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agobrcm80211: fmac: use brcmf_add_if for all net devices
Franky Lin [Fri, 21 Oct 2011 14:16:32 +0000 (16:16 +0200)]
brcm80211: fmac: use brcmf_add_if for all net devices

Use brcmf_add_if for primary and virtual net device interfaces. This
is part of the net device interface clean up for fullmac.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agobrcm80211: smac: use sk_buff list for handling frames in receive path
Arend van Spriel [Fri, 21 Oct 2011 14:16:31 +0000 (16:16 +0200)]
brcm80211: smac: use sk_buff list for handling frames in receive path

In the receive path the frames are obtained from the dma using
multiple sk_buff that were linked using the skb next pointer.
This has been changed and it now used sk_buff lists and skb_queue
functions instead.

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>