]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
12 years agoMerge remote-tracking branch 'cputime/cputime'
Stephen Rothwell [Thu, 17 Nov 2011 01:43:00 +0000 (12:43 +1100)]
Merge remote-tracking branch 'cputime/cputime'

12 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 17 Nov 2011 01:41:39 +0000 (12:41 +1100)]
Merge remote-tracking branch 'iommu/next'

12 years agoMerge remote-tracking branch 'watchdog/linux-next'
Stephen Rothwell [Thu, 17 Nov 2011 01:40:15 +0000 (12:40 +1100)]
Merge remote-tracking branch 'watchdog/linux-next'

12 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 17 Nov 2011 01:37:35 +0000 (12:37 +1100)]
Merge remote-tracking branch 'security/next'

12 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 01:36:16 +0000 (12:36 +1100)]
Merge remote-tracking branch 'regulator/for-next'

12 years agoMerge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Thu, 17 Nov 2011 01:34:49 +0000 (12:34 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'

12 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 01:20:48 +0000 (12:20 +1100)]
Merge remote-tracking branch 'md/for-next'

12 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 01:19:25 +0000 (12:19 +1100)]
Merge remote-tracking branch 'slab/for-next'

12 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 17 Nov 2011 01:19:14 +0000 (12:19 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

12 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 17 Nov 2011 01:17:46 +0000 (12:17 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

12 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 17 Nov 2011 01:16:16 +0000 (12:16 +1100)]
Merge remote-tracking branch 'battery/master'

12 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 01:13:52 +0000 (12:13 +1100)]
Merge remote-tracking branch 'block/for-next'

12 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 17 Nov 2011 01:12:24 +0000 (12:12 +1100)]
Merge remote-tracking branch 'input/next'

Conflicts:
drivers/input/keyboard/samsung-keypad.c

12 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Thu, 17 Nov 2011 01:10:56 +0000 (12:10 +1100)]
Merge branch 'quilt/rr'

12 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Thu, 17 Nov 2011 01:10:42 +0000 (12:10 +1100)]
Merge remote-tracking branch 'cpufreq/next'

12 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 01:09:10 +0000 (12:09 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

12 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 01:07:41 +0000 (12:07 +1100)]
Merge remote-tracking branch 'sound/for-next'

12 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 17 Nov 2011 01:06:12 +0000 (12:06 +1100)]
Merge remote-tracking branch 'crypto/master'

12 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 17 Nov 2011 01:04:51 +0000 (12:04 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

12 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 17 Nov 2011 01:03:20 +0000 (12:03 +1100)]
Merge remote-tracking branch 'bluetooth/master'

12 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Thu, 17 Nov 2011 00:57:39 +0000 (11:57 +1100)]
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/libertas/cfg.c
include/net/bluetooth/bluetooth.h

12 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 17 Nov 2011 00:51:55 +0000 (11:51 +1100)]
Merge remote-tracking branch 'net-next/master'

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 17 Nov 2011 00:50:34 +0000 (11:50 +1100)]
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/pl330.c

12 years agoMerge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Thu, 17 Nov 2011 00:49:11 +0000 (11:49 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'

12 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:47:39 +0000 (11:47 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

12 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Thu, 17 Nov 2011 00:46:19 +0000 (11:46 +1100)]
Merge remote-tracking branch 'libata/NEXT'

12 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:46:14 +0000 (11:46 +1100)]
Merge remote-tracking branch 'kconfig/for-next'

12 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:44:49 +0000 (11:44 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

12 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 17 Nov 2011 00:41:33 +0000 (11:41 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

12 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Thu, 17 Nov 2011 00:40:13 +0000 (11:40 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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

12 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Thu, 17 Nov 2011 00:38:05 +0000 (11:38 +1100)]
Merge branch 'quilt/i2c'

12 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:36:49 +0000 (11:36 +1100)]
Merge remote-tracking branch 'hid/for-next'

12 years agoMerge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:33:46 +0000 (11:33 +1100)]
Merge remote-tracking branch 'pci/linux-next'

12 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Thu, 17 Nov 2011 00:32:28 +0000 (11:32 +1100)]
Merge remote-tracking branch 'xfs/master'

12 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:31:04 +0000 (11:31 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

Conflicts:
fs/ocfs2/xattr.c

12 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:29:32 +0000 (11:29 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

12 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:28:12 +0000 (11:28 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

12 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 17 Nov 2011 00:26:56 +0000 (11:26 +1100)]
Merge remote-tracking branch 'logfs/master'

Conflicts:
fs/logfs/file.c

12 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 17 Nov 2011 00:25:21 +0000 (11:25 +1100)]
Merge remote-tracking branch 'gfs2/master'

12 years agoMerge remote-tracking branch 'cifs/master'
Stephen Rothwell [Thu, 17 Nov 2011 00:23:58 +0000 (11:23 +1100)]
Merge remote-tracking branch 'cifs/master'

12 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Thu, 17 Nov 2011 00:22:33 +0000 (11:22 +1100)]
Merge remote-tracking branch 'xtensa/master'

12 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 17 Nov 2011 00:21:18 +0000 (11:21 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

12 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 17 Nov 2011 00:20:00 +0000 (11:20 +1100)]
Merge remote-tracking branch 's390/features'

12 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Thu, 17 Nov 2011 00:19:42 +0000 (11:19 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

12 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:18:16 +0000 (11:18 +1100)]
Merge remote-tracking branch 'parisc/for-next'

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

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:15:09 +0000 (11:15 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/Kconfig.debug

12 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:13:45 +0000 (11:13 +1100)]
Merge remote-tracking branch 'm68k/for-next'

12 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 17 Nov 2011 00:12:29 +0000 (11:12 +1100)]
Merge remote-tracking branch 'ia64/next'

12 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:10:45 +0000 (11:10 +1100)]
Merge remote-tracking branch 'cris/for-next'

12 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:05:26 +0000 (11:05 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

12 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:04:07 +0000 (11:04 +1100)]
Merge remote-tracking branch 'tegra/for-next'

12 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:02:50 +0000 (11:02 +1100)]
Merge remote-tracking branch 's5p/for-next'

12 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Thu, 17 Nov 2011 00:01:27 +0000 (11:01 +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

12 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Wed, 16 Nov 2011 23:59:54 +0000 (10:59 +1100)]
Merge remote-tracking branch 'at91/at91-next'

12 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Wed, 16 Nov 2011 23:58:34 +0000 (10:58 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h

12 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 16 Nov 2011 23:57:14 +0000 (10:57 +1100)]
Merge remote-tracking branch 'arm/for-next'

12 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Wed, 16 Nov 2011 23:51:10 +0000 (10:51 +1100)]
Merge remote-tracking branch 'ide/master'

12 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Wed, 16 Nov 2011 23:50:56 +0000 (10:50 +1100)]
Merge remote-tracking branch 'input-current/for-linus'

12 years agoMerge remote-tracking branch 'char-misc.current/char-misc-linus'
Stephen Rothwell [Wed, 16 Nov 2011 23:50:55 +0000 (10:50 +1100)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'

12 years agoMerge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Wed, 16 Nov 2011 23:50:54 +0000 (10:50 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'

12 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Wed, 16 Nov 2011 23:50:53 +0000 (10:50 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus'

12 years agoMerge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Wed, 16 Nov 2011 23:50:52 +0000 (10:50 +1100)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'

12 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Wed, 16 Nov 2011 23:50:50 +0000 (10:50 +1100)]
Merge remote-tracking branch 'wireless/master'

12 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Wed, 16 Nov 2011 23:50:47 +0000 (10:50 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'

12 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Wed, 16 Nov 2011 23:50:46 +0000 (10:50 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

12 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Wed, 16 Nov 2011 23:50:45 +0000 (10:50 +1100)]
Merge remote-tracking branch 'net/master'

12 years agoMerge remote-tracking branch 'scsi-rc-fixes/master'
Stephen Rothwell [Wed, 16 Nov 2011 23:50:44 +0000 (10:50 +1100)]
Merge remote-tracking branch 'scsi-rc-fixes/master'

12 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Wed, 16 Nov 2011 23:50:44 +0000 (10:50 +1100)]
Merge remote-tracking branch 'sparc/master'

12 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Wed, 16 Nov 2011 23:50:41 +0000 (10:50 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

12 years agoi2c: Delete ANY_I2C_BUS
Jean Delvare [Wed, 16 Nov 2011 23:43:22 +0000 (10:43 +1100)]
i2c: Delete ANY_I2C_BUS

Last piece of code using ANY_I2C_BUS was deleted almost 2 years ago,
so ANY_I2C_BUS can go away as well.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agoi2c: Fix device name for 10-bit slave address
Jean Delvare [Wed, 16 Nov 2011 23:43:22 +0000 (10:43 +1100)]
i2c: Fix device name for 10-bit slave address

10-bit addresses overlap with traditional 7-bit addresses, leading in
device name collisions. Add an arbitrary offset to 10-bit addresses to
prevent this collision. The offset was chosen so that the address is
still easily recognizable.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
12 years agoi2c-algo-bit: Generate correct i2c address sequence for 10-bit target
Jeffrey (Sheng-Hui) Chu [Wed, 16 Nov 2011 23:43:20 +0000 (10:43 +1100)]
i2c-algo-bit: Generate correct i2c address sequence for 10-bit target

The wrong bits were put on the wire, fix that.

This fixes kernel bug #42562.

Signed-off-by: Sheng-Hui J. Chu <jeffchu@broadcom.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agoMerge branch 'for-james' of git://github.com/srajiv/tpm into next
James Morris [Wed, 16 Nov 2011 23:08:37 +0000 (10:08 +1100)]
Merge branch 'for-james' of git://github.com/srajiv/tpm into next

12 years agobe2net: Use V1 query link status command for lancer
Padmanabh Ratnakar [Wed, 16 Nov 2011 02:03:45 +0000 (02:03 +0000)]
be2net: Use V1 query link status command for lancer

Use V1 version of query link status command for Lancer.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agobe2net: Fix VLAN promiscous mode for Lancer
Padmanabh Ratnakar [Wed, 16 Nov 2011 02:03:32 +0000 (02:03 +0000)]
be2net: Fix VLAN promiscous mode for Lancer

To enable VLAN promiscous mode, the HW interface should be created
with VLAN promiscous capability in Lancer. Add this capability during
creation of the HW interface.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agobe2net: Add EEPROM dump feature for Lancer
Padmanabh Ratnakar [Wed, 16 Nov 2011 02:03:07 +0000 (02:03 +0000)]
be2net: Add EEPROM dump feature for Lancer

Implemented eeprom dump using ethtool feature for Lancer.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agobe2net: add register dump feature for Lancer
Padmanabh Ratnakar [Wed, 16 Nov 2011 02:02:43 +0000 (02:02 +0000)]
be2net: add register dump feature for Lancer

Implement register dump using ethtool for Lancer.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agobe2net: Fix TX queue create for Lancer
Padmanabh Ratnakar [Wed, 16 Nov 2011 02:02:23 +0000 (02:02 +0000)]
be2net: Fix TX queue create for Lancer

Lancer uses V1 version of TXQ create. This command needs interface
id for TX queue creation. Rearrange code such that tx queue create
is after interface create. As TXQ create is now called after MCC
ring create use MCC instead of MBOX.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoinfiniband: Update net drivers for netdev_features_t changes.
David S. Miller [Wed, 16 Nov 2011 23:05:50 +0000 (18:05 -0500)]
infiniband: Update net drivers for netdev_features_t changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonet: remove NETIF_F_NO_CSUM feature bit
Michał Mirosław [Tue, 15 Nov 2011 15:29:55 +0000 (15:29 +0000)]
net: remove NETIF_F_NO_CSUM feature bit

Only distinct use is checking if NETIF_F_NOCACHE_COPY should be
enabled by default. The check heuristics is altered a bit here,
so it hits other people than before. The default shouldn't be
trusted for performance-critical cases anyway.

For all other uses NETIF_F_NO_CSUM is equivalent to NETIF_F_HW_CSUM.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonet: extend netdev_features_t to 64 bits
Michał Mirosław [Tue, 15 Nov 2011 15:29:55 +0000 (15:29 +0000)]
net: extend netdev_features_t to 64 bits

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoethtool: prepare for larger netdev_features_t type
Michał Mirosław [Tue, 15 Nov 2011 15:29:55 +0000 (15:29 +0000)]
ethtool: prepare for larger netdev_features_t type

v2: changed loop in ethtool_set_features() per Ben's suggestion

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonet: ethtool: use C99 array initialization for feature-names table
Michał Mirosław [Tue, 15 Nov 2011 15:29:55 +0000 (15:29 +0000)]
net: ethtool: use C99 array initialization for feature-names table

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonet: Define enum for net device features.
Michał Mirosław [Tue, 15 Nov 2011 15:29:55 +0000 (15:29 +0000)]
net: Define enum for net device features.

Define feature values by bit position instead of direct 2**i values
and force the values to be of type netdev_features_t.

Cleaned and extended from patch by Mahesh Bandewar <maheshb@google.com>:
+ added netdev_features_t casts
+ included bits under NETIF_F_GSO_MASK
+ moved feature #defines out of struct net_device definition

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonet: introduce and use netdev_features_t for device features sets
Michał Mirosław [Tue, 15 Nov 2011 15:29:55 +0000 (15:29 +0000)]
net: introduce and use netdev_features_t for device features sets

v2: add couple missing conversions in drivers
split unexporting netdev_fix_features()
implemented %pNF
convert sock::sk_route_(no?)caps

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonet: split netdev features to separate header
Michał Mirosław [Tue, 15 Nov 2011 15:29:55 +0000 (15:29 +0000)]
net: split netdev features to separate header

Move features definitions to separate header so that linux/skbuff.h won't
need to include linux/netdevice.h after netdev_features_t is introduced.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonet: ethtool: break association of ETH_FLAG_* with NETIF_F_*
Michał Mirosław [Tue, 15 Nov 2011 15:29:55 +0000 (15:29 +0000)]
net: ethtool: break association of ETH_FLAG_* with NETIF_F_*

This is the only place left where dev->features are directly
exposed to userspace.

I know checkpatch.pl complains about __ethtool_{get,set}_flags(), but
the code is easier to read this way.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonet: remove legacy ethtool ops
Michał Mirosław [Tue, 15 Nov 2011 15:29:55 +0000 (15:29 +0000)]
net: remove legacy ethtool ops

As all drivers are converted, we may now remove discrete offload setting
callback handling.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonet: sweep-up some straglers in strlcpy conversion of .get_drvinfo routines
Rick Jones [Tue, 15 Nov 2011 14:59:53 +0000 (14:59 +0000)]
net: sweep-up some straglers in strlcpy conversion of .get_drvinfo routines

Convert some remaining straglers' .get_drvinfo routines to use strlcpy
rather than strcpy/strncpy.

Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agopch_gbe: Move #include of module.h
Joe Perches [Tue, 15 Nov 2011 13:56:14 +0000 (13:56 +0000)]
pch_gbe: Move #include of module.h

The first #include must be pch_gbe.h as it
does a #define of pr_fmt.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agobnx2x: cache-in compressed fw image
Dmitry Kravkov [Tue, 15 Nov 2011 12:07:33 +0000 (12:07 +0000)]
bnx2x: cache-in compressed fw image

Re-request fw from fs may fail for different reasons, once the fw was
loaded we won't release it until driver is removed.

This also resolves the boot problem when initial fw is located on initrd,
but rootfs is still unavailable, in this case device reset will fail due
to absence of fw files.

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoKEYS: Give key types their own lockdep class for key->sem
David Howells [Wed, 16 Nov 2011 11:15:54 +0000 (11:15 +0000)]
KEYS: Give key types their own lockdep class for key->sem

Give keys their own lockdep class to differentiate them from each other in case
a key of one type has to refer to a key of another type.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
12 years agonet/cadence: enable by default NET_ATMEL
Jean-Christophe PLAGNIOL-VILLARD [Tue, 15 Nov 2011 09:36:30 +0000 (09:36 +0000)]
net/cadence: enable by default NET_ATMEL

so the defconfig of the atmel continue to have the support of the network
as before

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agobridge: correct IPv6 checksum after pull
stephen hemminger [Tue, 15 Nov 2011 08:09:14 +0000 (08:09 +0000)]
bridge: correct IPv6 checksum after pull

Bridge multicast snooping of ICMPv6 would incorrectly report a checksum problem
when used with Ethernet devices like sky2 that use CHECKSUM_COMPLETE.
When bytes are removed from skb, the computed checksum needs to be adjusted.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Tested-by: Martin Volf <martin.volf.42@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonet: use jump_label for netstamp_needed
Eric Dumazet [Tue, 15 Nov 2011 04:12:55 +0000 (04:12 +0000)]
net: use jump_label for netstamp_needed

netstamp_needed seems a good candidate to jump_label conversion.

This avoids 3 conditional branches per incoming packet in fast path.

No measurable difference, given that these conditional branches are
predicted on modern cpus. Only a small icache reduction, thanks to the
unlikely() stuff.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoqeth: Reduce CPU consumption through less SIGA-r calls
Einar Lueck [Tue, 15 Nov 2011 02:31:16 +0000 (02:31 +0000)]
qeth: Reduce CPU consumption through less SIGA-r calls

Patch avoids SIGA-r calls in case of SIGA-r required. It only calls
SIGA-r if a threshold of free buffer is reached. CPU consumption is
reduced as a consequence.

Signed-off-by: Einar Lueck <elelueck@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoqeth: l3 fix rcu splat in xmit
Frank Blaschka [Tue, 15 Nov 2011 02:31:15 +0000 (02:31 +0000)]
qeth: l3 fix rcu splat in xmit

when use dst_get_neighbour to get neighbour, we need
rcu_read_lock to protect, since dst_get_neighbour uses
rcu_dereference.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonetiucv: reinsert dev_alloc_name for device naming
Ursula Braun [Tue, 15 Nov 2011 02:31:14 +0000 (02:31 +0000)]
netiucv: reinsert dev_alloc_name for device naming

Invocation of dev_alloc_name() is re-inserted, because the created
net_device name is used to create the device name for the iucv bus.
This device is created before the register_netdev call.

Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoqeth: remove WARN_ON leftover
Christian Borntraeger [Tue, 15 Nov 2011 02:31:13 +0000 (02:31 +0000)]
qeth: remove WARN_ON leftover

The patch "qeth: exploit asynchronous delivery of storage blocks"
added a WARN_ON in qeth_schedule_recovery. A device recovery should
not cause a kernel warning. This is obviously a debugging  left-over
that we forgot to remove.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>