aboutsummaryrefslogtreecommitdiff
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-06Make the "word-at-a-time" helper functions more commonly usableLinus Torvalds
I have a new optimized x86 "strncpy_from_user()" that will use these same helper functions for all the same reasons the name lookup code uses them. This is preparation for that. This moves them into an architecture-specific header file. It's architecture-specific for two reasons: - some of the functions are likely to want architecture-specific implementations. Even if the current code happens to be "generic" in the sense that it should work on any little-endian machine, it's likely that the "multiply by a big constant and shift" implementation is less than optimal for an architecture that has a guaranteed fast bit count instruction, for example. - I expect that if architectures like sparc want to start playing around with this, we'll need to abstract out a few more details (in particular the actual unaligned accesses). So we're likely to have more architecture-specific stuff if non-x86 architectures start using this. (and if it turns out that non-x86 architectures don't start using this, then having it in an architecture-specific header is still the right thing to do, of course) Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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-06net: fix a race in sock_queue_err_skb()Eric Dumazet
As soon as an skb is queued into socket error queue, another thread can consume it, so we are not allowed to reference skb anymore, or risk use after free. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-06netlink: fix races after skb queueingEric Dumazet
As soon as an skb is queued into socket receive_queue, another thread can consume it, so we are not allowed to reference skb anymore, or risk use after free. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
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-06doc, net: Update ndo_start_xmit return type and valuesBen Hutchings
Commit dc1f8bf68b311b1537cb65893430b6796118498a ('netdev: change transmit to limited range type') changed the required return type and 9a1654ba0b50402a6bd03c7b0fe9b0200a5ea7b1 ('net: Optimize hard_start_xmit() return checking') changed the valid numerical return values. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-06doc, net: Remove instruction to set net_device::trans_startBen Hutchings
Commit 08baf561083bc27a953aa087dd8a664bb2b88e8e ('net: txq_trans_update() helper') made it unnecessary for most drivers to set net_device::trans_start (or netdev_queue::trans_start). Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-06doc, net: Update netdev operation namesBen Hutchings
Commits d314774cf2cd5dfeb39a00d37deee65d4c627927 ('netdev: network device operations infrastructure') and 008298231abbeb91bc7be9e8b078607b816d1a4a ('netdev: add more functions to netdevice ops') moved and renamed net device operation pointers. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>