aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* r8169: check firmware content sooner.Francois Romieu2011-06-18
| | | | | | | Firmware checking is only performed when the firmware is loaded instead of each time the driver inits the phy. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
* r8169: support new firmware format.Hayes Wang2011-06-18
| | | | | | | | | The new firmware format adds versioning as firmware for a specific chipset appears to be subject to change. Current "legacy" format is still supported. Signed-off-by: Hayes Wang <hayeswang@realtek.com> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
* r8169: explicit firmware format check.Francois Romieu2011-06-18
| | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
* r8169: move the firmware down into the device private data.Francois Romieu2011-06-17
| | | | | | No functional difference. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
* e1000: remove unnecessary codeGreg Dietsche2011-06-17
| | | | | | | | | | | Compile tested. remove unnecessary code that matches this coccinelle pattern if (...) return ret; return ret; Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
* net: icplus: remove unnecessary codeGreg Dietsche2011-06-17
| | | | | | | | | | | Compile tested. remove unnecessary code that matches this coccinelle pattern if (...) return ret; return ret; Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
* net/rds: use prink_ratelimited() instead of printk_ratelimit()Manuel Zerpies2011-06-17
| | | | | | | | Since printk_ratelimit() shouldn't be used anymore (see comment in include/linux/printk.h), replace it with printk_ratelimited() Signed-off-by: Manuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
* net/can: use printk_ratelimited() instead of printk_ratelimit()Manuel Zerpies2011-06-17
| | | | | | | | Since printk_ratelimit() shouldn't be used anymore (see comment in include/linux/printk.h), replace it with printk_ratelimited(). Signed-off-by: Manuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
* rtnetlink: unlock on error path in netlink_dump()Dan Carpenter2011-06-16
| | | | | | | | | In c7ac8679bec939 "rtnetlink: Compute and store minimum ifinfo dump size", we moved the allocation under the lock so we need to unlock on error path. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
* gianfar: Use pr_<level>, netdev_<level> and netif_<level>Joe Perches2011-06-16
| | | | | | | | | | | | | | | | Use the current logging styles. Add #define DEBUG to get same output for <foo>_dbg messages. Convert a few bare printks to pr_err. Fix a likely copy/paste defect where a test was done with RX values: if (num_rx_qs > MAX_RX_QS) { but TX limits were emitted: printk(KERN_ERR "num_rx_qs(=%d) greater than MAX_RX_QS(=%d)\n", num_tx_qs, MAX_TX_QS); Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
* net: Remove casts of void *Joe Perches2011-06-16
| | | | | | | | | | | | | | | | | | | | | | | Unnecessary casts of void * clutter the code. These are the remainder casts after several specific patches to remove netdev_priv and dev_priv. Done via coccinelle script: $ cat cast_void_pointer.cocci @@ type T; T *pt; void *pv; @@ - pt = (T *)pv; + pt = pv; Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Paul Moore <paul.moore@hp.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
* be2net: support multiple TX queuesSathya Perla2011-06-16
| | | | | | | This patch provides support for multiple TX queues. Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
* netfilter: ipset: whitespace and coding fixes detected by checkpatch.plJozsef Kadlecsik2011-06-16
| | | | | Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: hash:net,iface type introducedJozsef Kadlecsik2011-06-16
| | | | | | | | | | | | | The hash:net,iface type makes possible to store network address and interface name pairs in a set. It's mostly suitable for egress and ingress filtering. Examples: # ipset create test hash:net,iface # ipset add test 192.168.0.0/16,eth0 # ipset add test 192.168.0.0/24,eth1 Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: use the stored first cidr value instead of '1'Jozsef Kadlecsik2011-06-16
| | | | | Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: fix return code for destroy when sets are in useJozsef Kadlecsik2011-06-16
| | | | | Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: add xt_action_param to the variant level kadt functions, ↵Jozsef Kadlecsik2011-06-16
| | | | | | | | | | | ipset API change With the change the sets can use any parameter available for the match and target extensions, like input/output interface. It's required for the hash:net,iface set type. Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: use unified from/to address masking and check the usageJozsef Kadlecsik2011-06-16
| | | | | Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: take into account cidr value for the from address when ↵Jozsef Kadlecsik2011-06-16
| | | | | | | | | | | creating the set When creating a set from a range expressed as a network like 10.1.1.172/29, the from address was taken as the IP address part and not masked with the netmask from the cidr. Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: adding ranges to hash types with timeout could still fail, ↵Jozsef Kadlecsik2011-06-16
| | | | | | | | | | | fixed The patch "Fix adding ranges to hash types" had got a mistypeing in the timeout variant of the hash types, which actually made the patch ineffective. Fixed! Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: support range for IPv4 at adding/deleting elements for ↵Jozsef Kadlecsik2011-06-16
| | | | | | | | | | | | | | | | | | | | | | | | hash:*net* types The range internally is converted to the network(s) equal to the range. Example: # ipset new test hash:net # ipset add test 10.2.0.0-10.2.1.12 # ipset list test Name: test Type: hash:net Header: family inet hashsize 1024 maxelem 65536 Size in memory: 16888 References: 0 Members: 10.2.1.12 10.2.1.0/29 10.2.0.0/24 10.2.1.8/30 Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: set type support with multiple revisions addedJozsef Kadlecsik2011-06-16
| | | | | | | | A set type may have multiple revisions, for example when syntax is extended. Support continuous revision ranges in set types. Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: fix adding ranges to hash typesJozsef Kadlecsik2011-06-16
| | | | | | | | | | | When ranges are added to hash types, the elements may trigger rehashing the set. However, the last successfully added element was not kept track so the adding started again with the first element after the rehashing. Bug reported by Mr Dash Four. Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: support listing setnames and headers tooJozsef Kadlecsik2011-06-16
| | | | | | | | | Current listing makes possible to list sets with full content only. The patch adds support partial listings, i.e. listing just the existing setnames or listing set headers, without set members. Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: options and flags support added to the kernel APIJozsef Kadlecsik2011-06-16
| | | | | | | | | The support makes possible to specify the timeout value for the SET target and a flag to reset the timeout for already existing entries. Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: whitespace fixes: some space before tab slipped inJozsef Kadlecsik2011-06-16
| | | | | Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* netfilter: ipset: timeout can be modified for already added elementsJozsef Kadlecsik2011-06-16
| | | | | | | | | | | | | When an element to a set with timeout added, one can change the timeout by "readding" the element with the "-exist" flag. That means the timeout value is reset to the specified one (or to the default from the set specification if the "timeout n" option is not used). Example ipset add foo 1.2.3.4 timeout 10 ipset add foo 1.2.3.4 timeout 600 -exist Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
* Merge branch 'master' of ↵Patrick McHardy2011-06-16
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next-2.6
| * IPVS: remove unused init and cleanup functions.Hans Schillstrom2011-06-13
| | | | | | | | | | | | | | | | After restructuring, there is some unused or empty functions left to be removed. Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com> Signed-off-by: Simon Horman <horms@verge.net.au>
| * IPVS: labels at pos 0Hans Schillstrom2011-06-13
| | | | | | | | | | | | | | | | Put goto labels at the beginig of row acording to coding style example. Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com> Signed-off-by: Simon Horman <horms@verge.net.au>
| * IPVS: rename of netns init and cleanup functions.Hans Schillstrom2011-06-13
| | | | | | | | | | | | | | | | | | Make it more clear what the functions does, on request by Julian. Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com> Signed-off-by: Hans Schillstrom <hans@schillstrom.com> Signed-off-by: Simon Horman <horms@verge.net.au>
| * IPVS remove unused var from migration to netnsHans Schillstrom2011-06-13
| | | | | | | | | | | | | | | | Remove variable ctl_key from struct netns_ipvs, it's a leftover from early netns work. Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com> Signed-off-by: Simon Horman <horms@verge.net.au>
| * ipvs: support more FTP PASV responsesJulian Anastasov2011-06-12
| | | | | | | | | | | | | | | | | | Change the parsing of FTP commands and responses to support skip character. It allows to detect variations in the 227 PASV response. Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au>
* | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2011-06-16
|\ \
| * | tg3: Create funcs for power source switchingMatt Carlson2011-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The power source switching code is about to get a little more complex. This patch seeks to simplify future power source switching patches by clarifying the existing code. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | tg3: Migrate phy preprocessor defs to system defsMatt Carlson2011-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes to code to use some of the preprocessor definitions from mii.h over its homegrown equivalents. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | tg3: Show flowctrl settings through get_settings()Matt Carlson2011-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds code to present the flow control advertisements through the ethtool get_settings callback. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | tg3: Fix EEE debounce timer valuesMatt Carlson2011-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the EEE debounce timer values. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | tg3: Add more selfboot formats to NVRAM selftestMatt Carlson2011-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds more selfboot formats to the NVRAM selftest. It also changes the code to return an error on an unsupported NVRAM format. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | tg3: Remove 4G_DMA_BNDRY_BUG flagMatt Carlson2011-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that all chips have this bug, the flag checks become useless code. This patch removes the flag. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | tg3: Remove 40BIT_DMA_LIMIT_BUGMatt Carlson2011-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the 40BIT_DMA_LIMIT_BUG flag. There already exists a flag for this purpose (TG3_FLAG_40BIT_DMA_BUG) and was already being used in the correct spot. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | tg3: Workaround tagged status update bugMatt Carlson2011-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On rare occasions, writing the tag to the interrupt mailbox does not reenable interrupts. This patch fixes the problem by reissuing the mailbox update. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | bnx2x: Update date to 2011/06/13 and version to 1.70.00-0Vladislav Zolotarov2011-06-15
| | | | | | | | | | | | | | | | | | Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | bnx2x: PFC support for 578xxDmitry Kravkov2011-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add supoprt for 3 COSes for 578xx devices. Fix HW configuration for PFC feature according to new HSI in link layer. Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | bnx2x: Rename LASI registers to definitions in mdio.hYaniv Rosner2011-06-15
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yaniv Rosner <yanivr@broadcom.com> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | bnx2x: Add a periodic task for link PHY eventsYaniv Rosner2011-06-15
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yaniv Rosner <yanivr@broadcom.com> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | bnx2x: Adjust BCM84833 to BCM578xxYaniv Rosner2011-06-15
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yaniv Rosner <yanivr@broadcom.com> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | bnx2x: Adjust ETS to 578xxYaniv Rosner2011-06-15
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yaniv Rosner <yanivr@broadcom.com> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | bnx2x: Add new PHY 54616sYaniv Rosner2011-06-15
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yaniv Rosner <yanivr@broadcom.com> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
| * | bnx2x: Add Warpcore support for 578xxYaniv Rosner2011-06-15
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yaniv Rosner <yanivr@broadcom.com> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>