summaryrefslogtreecommitdiffstats
path: root/drivers
AgeCommit message (Collapse)Author
2012-04-10Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller
2012-04-10wiznet: Fix Kconfig dependencies.David S. Miller
Both drivers need to depend upon HAS_IOMEM, otherwise we get a build failure on platforms like S390. All the driver specific config options need to depend upon the drivers themselves. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-07fealnx: Remove unused local label 'out' in netdev_open().David S. Miller
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-07ipw2100: remove useless tests in the PCI device remove path.Francois Romieu
Everything has been set up in the PCI probe function. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com>
2012-04-07ipw2100: stop using net_device.base_addr.Francois Romieu
No net_device.irq removal yet. The driver probe, remove and failure paths need some care beforehand. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com>
2012-04-07ipw2200: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com>
2012-04-07rrunner: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-07myri10ge: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Jon Mason <mason@myri.com> Acked-by: Andrew Gallatin <gallatin@myri.com>
2012-04-07sis900: stop using net_device.{base_addr, irq} and convert to __iomem.Francois Romieu
- pci_resource_start() can be removed from sis900_get_mac_addr() because the IO range is maped and stored into the device private struct early in the device probe function. - the driver contains a few direct accesses to low IO ports that forbid to re(#)define the usual out{l, w, b} macros. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Daniele Venzano <venza@brownhat.org>
2012-04-07dmfe: stop using net_device.{base_addr, irq} and convert to __iomem.Francois Romieu
This is a pure PCI driver, no ISA here. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Acked-by: Grant Grundler <grundler@parisc-linux.org>
2012-04-07epic100: stop using net_device.{base_addr, irq} and convert to __iomem.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-07uli526x: stop using net_device.{base_addr, irq} and convert to __iomem.Francois Romieu
The bulk of the patch comes from the __iomem changes. - the phy read and write operations were carrying the chip id deep down the call chain. Let's waste a pointer and contain the flying spaghetti monster. - phy_{read, write}_1bit only need to access the DCR9 register. The loss of generality here should not hurt. - removed a leftover printk of the EISA era. This is a pure PCI device. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Acked-by: Grant Grundler <grundler@parisc-linux.org>
2012-04-07dl2k: stop using net_device.{base_addr, irq} and convert to __iomem.Francois Romieu
The eeprom registers always use the same PCI bar whereas the general registers may either use the same mapping as the eeprom registers or a different one. It is thus possible to simplify parse_eeprom(). Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-078139too: dev->{base_addr, irq} removal.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-07natsemi: stop using net_device.{base_addr, irq}.Francois Romieu
It's useless to check mem_start on a newly allocated device. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Tim Hockin <thockin@hockin.org>
2012-04-07smsc9420: stop using net_device.{base_addr, irq}.Francois Romieu
The device private data pointer can not be NULL in smsc9420_open(). Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Steve Glendinning <steve.glendinning@smsc.com>
2012-04-07de2104x: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Acked-by: Grant Grundler <grundler@parisc-linux.org>
2012-04-07xircom_cb: stop using net_device.{base_addr, irq} and convert to __iomem.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Acked-by: Grant Grundler <grundler@parisc-linux.org>
2012-04-07xircom_cb: fix device probe error path.Francois Romieu
- unbalanced pci_disable_device - PCI ressources were not released - mismatching pci_alloc_.../kfree pairs are replaced by DMA alloc helpers. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Ack-by: Grant Grundler <grundler@parisc-linux.org>
2012-04-07uli526x: fix regions leak in driver probe error path.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Ack-by: Grant Grundler <grundler@parisc-linux.org>
2012-04-07sunhme: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-07tulip_core: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Ack-by: Grant Grundler <grundler@parisc-linux.org>
2012-04-07sis190: stop using net_device.{base_addr, irq}Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-07sc92031: stop using net_device.{base_addr, irq}Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-07winbond840: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-07bnx2: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Acked-by: Michael Chan <mchan@broadcom.com>
2012-04-07starfire: remove deprecated options.Francois Romieu
Some settings are duplicated between ethtool link management and module options. The latter is trimmed. The half duplex, speed and autonegotiation defaults are kept unchanged. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Ion Badulescu <ionut@badula.org>
2012-04-07starfire: stop using net_device.{base_addr, irq}.Francois Romieu
It's useless to check mem_start on a newly allocated device as well. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Ion Badulescu <ionut@badula.org>
2012-04-07yellowfin: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-078139cp: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-07s2io: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Jon Mason <jdmason@kudzu.us>
2012-04-07atl1e: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Jay Cliburn <jcliburn@gmail.com> Cc: Chris Snook <chris.snook@gmail.com>
2012-04-07fealnx: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-07vxge: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Jon Mason <jdmason@kudzu.us>
2012-04-07sundance: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-07via-velocity: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: David Lv <DavidLv@viatech.com.cn>
2012-04-07hamachi: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-07via-rhine: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: David Lv <DavidLv@viatech.com.cn>
2012-04-07atl1c: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Jay Cliburn <jcliburn@gmail.com> Cc: Chris Snook <chris.snook@gmail.com>
2012-04-07forcedeth: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-07tehuti: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Andy Gospodarek <andy@greyhouse.net>
2012-04-07sungem: stop using net_device.{base_addr, irq}.Francois Romieu
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
2012-04-06Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds
Pull networking updates from David Miller: 1) Fix inaccuracies in network driver interface documentation, from Ben Hutchings. 2) Fix handling of negative offsets in BPF JITs, from Jan Seiffert. 3) Compile warning, locking, and refcounting fixes in netfilter's xt_CT, from Pablo Neira Ayuso. 4) phonet sendmsg needs to validate user length just like any other datagram protocol, fix from Sasha Levin. 5) Ipv6 multicast code uses wrong loop index, from RongQing Li. 6) Link handling and firmware fixes in bnx2x driver from Yaniv Rosner and Yuval Mintz. 7) mlx4 erroneously allocates 4 pages at a time, regardless of page size, fix from Thadeu Lima de Souza Cascardo. 8) SCTP socket option wasn't extended in a backwards compatible way, fix from Thomas Graf. 9) Add missing address change event emissions to bonding, from Shlomo Pongratz. 10) /proc/net/dev regressed because it uses a private offset to track where we are in the hash table, but this doesn't track the offset pullback that the seq_file code does resulting in some entries being missed in large dumps. Fix from Eric Dumazet. 11) do_tcp_sendpage() unloads the send queue way too fast, because it invokes tcp_push() when it shouldn't. Let the natural sequence generated by the splice paths, and the assosciated MSG_MORE settings, guide the tcp_push() calls. Otherwise what goes out of TCP is spaghetti and doesn't batch effectively into GSO/TSO clusters. From Eric Dumazet. 12) Once we put a SKB into either the netlink receiver's queue or a socket error queue, it can be consumed and freed up, therefore we cannot touch it after queueing it like that. Fixes from Eric Dumazet. 13) PPP has this annoying behavior in that for every transmit call it immediately stops the TX queue, then calls down into the next layer to transmit the PPP frame. But if that next layer can take it immediately, it just un-stops the TX queue right before returning from the transmit method. Besides being useless work, it makes several facilities unusable, in particular things like the equalizers. Well behaved devices should only stop the TX queue when they really are full, and in PPP's case when it gets backlogged to the downstream device. David Woodhouse therefore fixed PPP to not stop the TX queue until it's downstream can't take data any more. 14) IFF_UNICAST_FLT got accidently lost in some recent stmmac driver changes, re-add. From Marc Kleine-Budde. 15) Fix link flaps in ixgbe, from Eric W. Multanen. 16) Descriptor writeback fixes in e1000e from Matthew Vick. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits) net: fix a race in sock_queue_err_skb() netlink: fix races after skb queueing doc, net: Update ndo_start_xmit return type and values doc, net: Remove instruction to set net_device::trans_start doc, net: Update netdev operation names doc, net: Update documentation of synchronisation for TX multiqueue doc, net: Remove obsolete reference to dev->poll ethtool: Remove exception to the requirement of holding RTNL lock MAINTAINERS: update for Marvell Ethernet drivers bonding: properly unset current_arp_slave on slave link up phonet: Check input from user before allocating tcp: tcp_sendpages() should call tcp_push() once ipv6: fix array index in ip6_mc_add_src() mlx4: allocate just enough pages instead of always 4 pages stmmac: re-add IFF_UNICAST_FLT for dwmac1000 bnx2x: Clear MDC/MDIO warning message bnx2x: Fix BCM57711+BCM84823 link issue bnx2x: Clear BCM84833 LED after fan failure bnx2x: Fix BCM84833 PHY FW version presentation bnx2x: Fix link issue for BCM8727 boards. ...
2012-04-06stmmac: fix build when CONFIG_OF is enableGiuseppe Cavallaro
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-05Merge tag 'fixes-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: SoC fixes: from Olof Johansson: "A bunch of fixes for regressions (and a few other problems) in 3.4-rc1: - Fix for regression of mach/io.h cleanup on platforms with PCI or PCMCIA (adding back the include file on those for now) - AT91 fixes for usb and spi - smsc911x ethernet fixes for i.MX - smsc911x fixes for OMAP - gpio fixes for Tegra - A handful of build error and warning fixes for various platforms - cpufreq kconfig dependencies, build and lowlevel debug fixes for Samsung platforms In other words, more or less the regular collection of -rc1/2 type material. A few of them, in particular the smsc911x for OMAP series, aren't technically regressions for 3.4, but they're valid fixes and we're still relatively early in the rc cycle so it seems appropriate to include them." * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits) ARM: fix __io macro for PCMCIA ARM: EXYNOS: Fix compiler warning in dma.c file ARM: EXYNOS: fix ISO C90 warning ARM: OMAP2+: hwmod: Fix wrong SYSC_TYPE1_XXX_MASK bit definitions ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status ARM: OMAP2+: hwmod: Restore sysc after a reset ARM: OMAP2+: omap_hwmod: Allow io_ring wakeup configuration for all modules ARM: OMAP3: clock data: fill in some missing clockdomains ARM: OMAP4: clock data: Force a DPLL clkdm/pwrdm ON before a relock ARM: OMAP4: clock data: fix mult and div mask for USB_DPLL ARM: OMAP2+: powerdomain: Wait for powerdomain transition in pwrdm_state_switch() gpio: tegra: Iterate over the correct number of banks gpio: tegra: fix register address calculations for Tegra30 EXYNOS: fix dependency for EXYNOS_CPUFREQ ARM: at91: dt: remove unit-address part for memory nodes ARM: at91: fix check of valid GPIO for SPI and USB USB: ehci-atmel: add needed of.h header file ARM: at91/NAND DT bindings: add comments ARM: at91/at91sam9x5.dtsi: fix NAND ale/cle in DT file USB: ohci-at91: trivial return code name change ...
2012-04-06gianfar: Include linux/net_tstamp.hDavid S. Miller
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-06bfin: Fix build failure due to get_ts_info() changes.David S. Miller
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-05Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm Pull an APM fix from Jiri Kosina: "One deadlock/race fix from Niel that got introduced when we were moving away from freezer_*_count() to wait_event_freezable()." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm: APM: fix deadlock in APM_IOC_SUSPEND ioctl
2012-04-05bonding: properly unset current_arp_slave on slave link upVeaceslav Falico
When a slave comes up, we're unsetting the current_arp_slave without removing active flags from it, which can lead to situations where we have more than one slave with active flags in active-backup mode. To avoid this situation we must remove the active flags from a slave before removing it as a current_arp_slave. Signed-off-by: Veaceslav Falico <vfalico@redhat.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Marcelo Ricardo Leitner <mleitner@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-05Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds
Merge batch of fixes from Andrew Morton: "The simple_open() cleanup was held back while I wanted for laggards to merge things. I still need to send a few checkpoint/restore patches. I've been wobbly about merging them because I'm wobbly about the overall prospects for success of the project. But after speaking with Pavel at the LSF conference, it sounds like they're further toward completion than I feared - apparently davem is at the "has stopped complaining" stage regarding the net changes. So I need to go back and re-review those patchs and their (lengthy) discussion." * emailed from Andrew Morton <akpm@linux-foundation.org>: (16 patches) memcg swap: use mem_cgroup_uncharge_swap fix backlight: add driver for DA9052/53 PMIC v1 C6X: use set_current_blocked() and block_sigmask() MAINTAINERS: add entry for sparse checker MAINTAINERS: fix REMOTEPROC F: typo alpha: use set_current_blocked() and block_sigmask() simple_open: automatically convert to simple_open() scripts/coccinelle/api/simple_open.cocci: semantic patch for simple_open() libfs: add simple_open() hugetlbfs: remove unregister_filesystem() when initializing module drivers/rtc/rtc-88pm860x.c: fix rtc irq enable callback fs/xattr.c:setxattr(): improve handling of allocation failures fs/xattr.c:listxattr(): fall back to vmalloc() if kmalloc() failed fs/xattr.c: suppress page allocation failure warnings from sys_listxattr() sysrq: use SEND_SIG_FORCED instead of force_sig() proc: fix mount -t proc -o AAA