summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* dccp: combine the functionality of enqeueing and cloningGerrit Renker2011-07-041-7/+7
| | | | | | | | | Realising the following call pattern, * first dccp_entail() is called to enqueue a new skb and * then skb_clone() is called to transmit a clone of that skb, this patch integrates both into the same function. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
* dccp: Clean up slow-path input processingGerrit Renker2011-07-041-31/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch rearranges the order of statements of the slow-path input processing (i.e. any other state than OPEN), to resolve the following issues. 1. Dependencies: the order of statements now better matches RFC 4340, 8.5, i.e. step 7 is before step 9 (previously 9 was before 7), and parsing options in step 8 (which may consume resources) now comes after step 7. 2. Sequence number checks are omitted if in state LISTEN/REQUEST, due to the note underneath the table in RFC 4340, 7.5.3. As a result, CCID processing is now indeed confined to OPEN/PARTOPEN states, i.e. congestion control is performed only on the flow of data packets. This avoids pathological cases of doing congestion control on those messages which set up and terminate the connection. 3. Packets are now passed on to Ack Vector / CCID processing only after - step 7 (receive unexpected packets), - step 9 (receive Reset), - step 13 (receive CloseReq), - step 14 (receive Close) and only if the state is PARTOPEN. This simplifies CCID processing: - in LISTEN/CLOSED the CCIDs are non-existent; - in RESPOND/REQUEST the CCIDs have not yet been negotiated; - in CLOSEREQ and active-CLOSING the node has already closed this socket; - in passive-CLOSING the client is waiting for its Reset. In the last case, RFC 4340, 8.3 leaves it open to ignore further incoming data, which is the approach taken here. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
* net: sh_eth: remove __flush_purge_regionYoshihiro Shimoda2011-07-031-4/+4
| | | | | | | | | It is a function of SuperH architecture. There is no good to use the function on a driver generally. So, the driver uses dma_map_single() instead of __flush_purge_region. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* af_econet: Use current logging styles and neateningJoe Perches2011-07-031-75/+74
| | | | | | | | | | | Use pr_fmt() without KBUILD_MODNAME to allow AUN and econet prefixes. Convert printks with KERN_DEBUG to pr_debug. Hoist assigns from if. 80 column wrapping. Move open braces to end of line. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* netpoll: Remove wrapper function netpoll_pollJoe Perches2011-07-031-7/+2
| | | | | | | | Too trivial to live. cc: WANG Cong <amwang@redhat.com> Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* netpoll: Remove unused EXPORT_SYMBOLs of netpoll_poll and netpoll_poll_devJoe Perches2011-07-032-6/+2
| | | | | | | | | | | | | | | Unused symbols waste space. Commit 0e34e93177fb "(netpoll: add generic support for bridge and bonding devices)" added the symbol more than a year ago with the promise of "future use". Because it is so far unused, remove it for now. It can be easily readded if or when it actually needs to be used. cc: WANG Cong <amwang@redhat.com> Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'for-next' of ↵David S. Miller2011-07-015-6/+33
|\ | | | | | | git://git2.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
| * IEEE 802.15.4: do not enable driver debugging by defaultWerner Almesberger2011-06-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | The IEEE 802.15.4 drivers were compiled by default with debugging, which caused them to be rather chatty and slow. This patch silences them. People debugging drivers can still add a #define DEBUG in the beginning of the respective file or use dynamic debug This patch also removes the now unused option CONFIG_FFD. Signed-off-by: Werner Almesberger <werner@almesberger.net> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
| * ieee802154: free skb buffer if dev isn't runningAlexander Smirnov2011-06-301-1/+1
| | | | | | | | | | Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
| * ieee802154: it's IEEE 802.15.4, not ZigBeeDmitry Eremin-Solenikov2011-06-301-1/+1
| | | | | | | | Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
| * ieee802154: support specifying hw address for created devicesDmitry Eremin-Solenikov2011-06-301-0/+31
| | | | | | | | Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
| * fakehard: stop setting platform_data as it's unused anymoreDmitry Eremin-Solenikov2011-06-301-2/+0
| | | | | | | | | | | | | | Previously dev.platform_data was used to store a pointer to net device. Now this code was gone. Drop it. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
* | net: rds: fix const array syntaxGreg Dietsche2011-07-011-1/+1
| | | | | | | | | | | | | | Correct the syntax so that both array and pointer are const. Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: David S. Miller <davem@davemloft.net>
* | x25: Reduce switch/case indentJoe Perches2011-07-015-402/+396
| | | | | | | | | | | | | | | | | | Make the case labels the same indent as the switch. git diff -w shows 80 column line reflowing. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | sunrpc: Reduce switch/case indentJoe Perches2011-07-013-44/+41
| | | | | | | | | | | | | | | | | | Make the case labels the same indent as the switch. git diff -w shows 80 column line reflowing. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | sctp: Reduce switch/case indentJoe Perches2011-07-012-30/+31
| | | | | | | | | | | | | | | | | | | | | | Make the case labels the same indent as the switch. git diff -w shows useless break;s removed after returns and a comment added to an unnecessary default: break; because of a dubious gcc warning. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | netrom: Reduce switch/case indentJoe Perches2011-07-011-9/+13
| | | | | | | | | | | | | | | | | | | | | | Make the case labels the same indent as the switch. git diff -w shows code on same line as case moved to separate lines and a "/* Fallthrough */" comment added where appropriate. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | lapb: Reduce switch/case indentJoe Perches2011-07-012-467/+444
| | | | | | | | | | | | | | | | | | Make the case labels the same indent as the switch. git diff -w shows 80 column reflowing. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | ipv6: Reduce switch/case indentJoe Perches2011-07-011-76/+69
| | | | | | | | | | | | | | | | | | | | | | Make the case labels the same indent as the switch. git diff -w shows 80 column reflowing, removal of a useless break after return, and moving open brace after case instead of separate line. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | ipv4: Reduce switch/case indentJoe Perches2011-07-012-32/+32
| | | | | | | | | | | | | | | | | | Make the case labels the same indent as the switch. git diff -w shows no difference. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | netfilter: Reduce switch/case indentJoe Perches2011-07-014-167/+165
| | | | | | | | | | | | | | | | | | | | | | Make the case labels the same indent as the switch. git diff -w shows miscellaneous 80 column wrapping, comment reflowing and a comment for a useless gcc warning for an otherwise unused default: case. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | ipconfig: Reduce switch/case indentJoe Perches2011-07-011-35/+38
| | | | | | | | | | | | | | | | | | Make the case labels the same indent as the switch. git diff -w shows miscellaneous 80 column wrapping. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | econet: Reduce switch/case indentJoe Perches2011-07-011-13/+10
| | | | | | | | | | | | | | | | | | | | Make the case labels the same indent as the switch. Simplify a default case / return (unreached) Remove unnecessary break after return. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | decnet: Reduce switch/case indentJoe Perches2011-07-019-597/+603
| | | | | | | | | | | | | | | | | | | | Make the case labels the same indent as the switch. git diff -w shows differences for line wrapping. (fit multiple lines to 80 columns, join where possible) Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | appletalk: Reduce switch/case indentJoe Perches2011-07-012-259/+259
| | | | | | | | | | | | | | | | | | Make the case labels the same indent as the switch. (git diff -w net/appletalk shows no difference) Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | rtnl: provide link dump consistency infoThomas Graf2011-07-014-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a change sequence counter to each net namespace which is bumped whenever a netdevice is added or removed from the list. If such a change occurred while a link dump took place, the dump will have the NLM_F_DUMP_INTR flag set in the first message which has been interrupted and in all subsequent messages of the same dump. Note that links may still be modified or renamed while a dump is taking place but we can guarantee for userspace to receive a complete list of links and not miss any. Testing: I have added 500 VLAN netdevices to make sure the dump is split over multiple messages. Then while continuously dumping links in one process I also continuously deleted and re-added a dummy netdevice in another process. Multiple dumps per seconds have had the NLM_F_DUMP_INTR flag set. I guess we can wait for Johannes patch to hit net-next via the wireless tree. I just wanted to give this some testing right away. Signed-off-by: Thomas Graf <tgraf@infradead.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net: de4x5: Omit check for multicast bit in netdev_for_each_mc_addrTobias Klauser2011-07-011-4/+1
| | | | | | | | | | | | | | | | There is no need to check for the address being a multicast address in the netdev_for_each_mc_addr loop, so remove it. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
* | be2net: clear intr bit in be_probe()Sathya Perla2011-06-301-0/+6
| | | | | | | | | | | | | | | | It may be set in the card while the driver is probed by kdump kernel after a crash. Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | be2net: create/destroy rx-queues on interface open/closeSathya Perla2011-06-303-44/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some skews, the BE card sends pause frames (and not drop pkts) if there are no more posted buffers available for packet reception. This behaviour has a side effect: When an interface is disabled, buffers are no longer posted on the corresponding RX rings. All broadcast and multicast traffic being received on the port will quickly fill up the PMEM and cause pause push back. As the PMEM is shared by both the ports, all traffic being received on the other (enabled) port also gets stalled. The fix is to destroy RX rings when the interface is disabled. If there is no RX ring match in the RXF lookup, the packets are discarded and so don't hog the PMEM. The RXQ creation cmd must now use MCC instead of MBOX as they are are called post MCC queue creation. Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | be2net: fix certain cmd failure loggingSathya Perla2011-06-302-18/+23
| | | | | | | | | | | | | | | | | | | | Some (older)versions of cards/fw may not recognize certain cmds and return illegal/unsupported errors. As long as the driver can handle this gracefully there is no need to log an error msg. Also finetuned 2 existing error log messages. Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | qlcnic: add external loopback supportAmit Kumar Salecha2011-06-303-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Add external loopback test in self test: - Send set external loopback mode request to fw. To quiscent other storage functions. - Perform test - Send unset loopback mode request to fw. o Rename ilb to lb. o Update driver version 5.0.20. Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com> Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net: add external loopback test in ethtool self testAmit Kumar Salecha2011-06-301-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | External loopback test can be performed by application without any driver support on normal Ethernet cards. But on CNA devices, where multiple functions share same physical port. Here internal loopback test and external loopback test can be initiated by multiple functions at same time. To co exist all functions, firmware need to regulate what test can be run by which function. So before performing external loopback test, command need to send to firmware, which will quiescent other functions. User may not want to run external loopback test always. As special cable need to be connected for this test. So adding explicit flag in ethtool self test, which will specify interface to perform external loopback test. ETH_TEST_FL_EXTERNAL_LB: Application set to request external loopback test ETH_TEST_FL_EXTERNAL_LB_DONE: Driver ack if test performed Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com> Reviewed-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net: ucc_geth: Omit check for multicast bit in netdev_for_each_mc_addrTobias Klauser2011-06-301-5/+0
| | | | | | | | | | | | | | | | There is no need to check for the address being a multicast address in the netdev_for_each_mc_addr loop, so remove it. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net: iseries_veth: Omit check for multicast bit in netdev_for_each_mc_addrTobias Klauser2011-06-301-5/+3
| | | | | | | | | | | | | | | | There is no need to check for the address being a multicast address in the netdev_for_each_mc_addr loop, so remove it. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net: depca: Omit check for multicast bit in netdev_for_each_mc_addrTobias Klauser2011-06-301-13/+8
| | | | | | | | | | | | | | | | There is no need to check for the address being a multicast address in the netdev_for_each_mc_addr loop, so remove it. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net: am79c961a: Omit check for multicast bit in netdev_for_each_mc_addrTobias Klauser2011-06-301-8/+6
| | | | | | | | | | | | | | | | | | There is no need to check for the address being a multicast address in the netdev_for_each_mc_addr loop, so remove it. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
* | wanxl: remove a stray irq enableDan Carpenter2011-06-301-1/+1
| | | | | | | | | | | | | | | | This is error path calls unlock_irq() where we haven't disabled the IRQs. The comment says that this error path can never happen. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Exclude duplicated checking for iface-up. This flags is checked in ↵Alexander Smirnov2011-06-301-3/+0
| | | | | | | | | | | | | | | | 'is_skb_forwardable' function, which is subroutine of 'dev_forward_skb'. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | jme: Cleanup PM operations after using new PM APIGuo-Fu Tseng2011-06-302-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | 1. Using enum name instead of numeric value. 2. device_set_wakeup_enable expect bool argument adding !!() to the argument to be passed. 3. Remove non-jme-hardware related operations from jme_clear_pm() 4. Reuse jme_clear_pm() in jme_resume() and jme_powersave_phy() Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | jme: Fix compile warning introduced by new pm macroGuo-Fu Tseng2011-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | SIMPLE_DEV_PM_OPS is using SET_SYSTEM_SLEEP_PM_OPS and SET_SYSTEM_SLEEP_PM_OPS is empty when CONFIG_PM_SLEEP is not defined. Switching #ifdef CONFIG_PM to #ifdef CONFIG_PM_SLEEP Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | can: remove useless defaults in KconfigKurt Van Dijck2011-06-301-3/+0
| | | | | | | | | | | | | | | | There's no need for "default N' (or 'default n') as it's default. Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
* | enic: Add support to configure hardware interrupt coalesce timers in a ↵Vasanthy Kolluri2011-06-3011-26/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platform independent way enic driver and the underlying hardware use different units for representing the interrupt coalesce timer. Driver converts the interrupt coalesce timer in usec to hardware cycles while setting the relevant hardware registers. The conversion factor can be different for each of the adapter hardware types. So it is dynamically learnt from the adapter firmware using the devcmd CMD_INTR_COAL_CONVERT. This allows the driver to configure the hardware interrupt coalesce timers in a platform independent way. Signed-off-by: Danny Guo <dannguo@cisco.com> Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com> Signed-off-by: Roopa Prabhu <roprabhu@cisco.com> Signed-off-by: David Wang <dwang2@cisco.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
* | virtio-net: per cpu 64 bit stats (v2)stephen hemminger2011-06-301-6/+79
| | | | | | | | | | | | | | Use per-cpu variables to maintain 64 bit statistics. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
* | xen/netback: Add module alias for autoloadingBastian Blank2011-06-301-0/+1
|/ | | | | | | | | Add xen-backend:vif module alias to the xen-netback module. This allows automatic loading of the module. Signed-off-by: Bastian Blank <waldi@debian.org> Acked-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
* myri10ge: Update MAINTAINERSJon Mason2011-06-291-1/+1
| | | | | | | Update MAINTAINERS to refelect new people working on myri10ge Signed-off-by: Jon Mason <mason@myri.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* myri10ge: update versionJon Mason2011-06-291-2/+2
| | | | | | | Update version and copyright Signed-off-by: Jon Mason <mason@myri.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* myri10ge: misc style cleanupsJon Mason2011-06-291-18/+14
| | | | | | | | | Miscellaneous white space, style, and other cleanups v2 includes corrections from Joe Perches Signed-off-by: Jon Mason <mason@myri.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* myri10ge: remove unnecessary read of PCI_CAP_ID_EXPJon Mason2011-06-291-6/+5
| | | | | | | | | The PCIE capability offset is saved during PCI bus walking. It will remove an unnecessary search in the PCI configuration space if this value is referenced instead of reacquiring it. Signed-off-by: Jon Mason <mason@myri.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* myri10ge: add support for set_phys_idJon Mason2011-06-292-0/+57
| | | | | | | | | Add myri10ge driver support for the ethtool identify operation. NOTE: Rather than blinking (which is the normal case), when identify is used, the yellow LED turns solid. Signed-off-by: Jon Mason <mason@myri.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* myri10ge: allow small_bytes = 0Jon Mason2011-06-291-3/+11
| | | | | | | Allow page-based receive to work when small_bytes is set to 0. Signed-off-by: Jon Mason <mason@myri.com> Signed-off-by: David S. Miller <davem@davemloft.net>
OpenPOWER on IntegriCloud