summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* sch_choke: add choke_skb_cbEric Dumazet2011-02-241-2/+13
| | | | | | | | | | | | Better document choke skb->cb[] use, like we did in netem and sfb This adds a compile time check to make sure we dont exhaust skb->cb[] space. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> CC: Stephen Hemminger <shemminger@vyatta.com> CC: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* netem: update version and cleanupstephen hemminger2011-02-241-6/+4
| | | | | | | | Get rid of debug message that are not useful, and enable the log messages in case of error. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* netem: revised correlated loss generatorstephen hemminger2011-02-242-4/+296
| | | | | | | | | | | This is a patch originated with Stefano Salsano and Fabio Ludovici. It provides several alternative loss models for use with netem. This patch adds two state machine based loss models. See: http://netgroup.uniroma2.it/twiki/bin/view.cgi/Main/NetemCLG Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Revert "sch_netem: Remove classful functionality"stephen hemminger2011-02-241-8/+79
| | | | | | | | | | | | | | Many users have wanted the old functionality that was lost to be able to use pfifo as inner qdisc for netem. The reason that netem could not be classful with the older API was because of the limitations of the old dequeue/requeue interface; now that qdisc API has a peek function, there is no longer a problem with using any inner qdisc's. This reverts commit 02201464119334690fe209849843881b8e9cfa9f. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* netem: define NETEM_DIST_MAXstephen hemminger2011-02-242-1/+2
| | | | | | | | | Rather than magic constant in code, expose the maximum size of packet distribution table in API. In iproute2, q_netem defines MAX_DIST as 16K already. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* netem: use vmalloc for distribution tablestephen hemminger2011-02-241-4/+18
| | | | | | | | The netem probability table can be large (up to 64K bytes) which may be too large to allocate in one contiguous chunk. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* netem: cleanup dump codestephen hemminger2011-02-241-6/+3
| | | | | | | Use nla_put_nested to update netlink attribute value. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'master' of ↵David S. Miller2011-02-2411-80/+174
|\ | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
| * igb: update version stringCarolyn Wyborny2011-02-241-1/+1
| | | | | | | | | | | | | | | | | | This will synchronize the version with the out of tree driver which shares its functionality. Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * igb: Update Intel copyright notice for driver source.Carolyn Wyborny2011-02-241-1/+1
| | | | | | | | | | | | | | | | This fix updates copyright information to include current year 2011. Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * igb: add support for VF Transmit rate limit using iproute2Lior Levy2011-02-244-2/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented igb_ndo_set_vf_bw function which is being used by iproute2 tool. In addition, updated igb_ndo_get_vf_config function to show the actual rate limit to the user. The rate limitation can be configured only when the link is up. The rate limit value can be ranged between 0 and actual link speed measured in Mbps. A value of '0' disables the rate limit for this specific VF. iproute2 usage will be 'ip link set ethX vf Y rate Z'. After the command is made, the rate will be changed instantly. To view the current rate limit, use 'ip link show ethX'. The rates will be zeroed only upon driver reload or a link speed change. This feature is being supported only by 82576 device. Signed-off-by: Lior Levy <lior.levy@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * igbvf: remove Tx hang detectionLior Levy2011-02-242-63/+0
| | | | | | | | | | | | | | | | | | Removed Tx hang detection mechanism from igbvf. This mechanism has no affect and can cause false alarm message in some cases. Signed-off-by: Lior Levy <lior.levy@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * ixgbevf: Fix name of function in function header commentGreg Rose2011-02-241-8/+8
| | | | | | | | | | | | | | | | Some of the function names in function header comments did not match actual name of the function. Signed-off-by: Greg Rose <gregory.v.rose@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * ixgbevf: Enable jumbo frame support for X540 VFGreg Rose2011-02-242-2/+19
| | | | | | | | | | | | | | | | The X540 controller allows jumbo frame setup on a per VF basis. Enable use of jumbo frames when the VF device belongs to the X540 controller. Signed-off-by: Greg Rose <gregory.v.rose@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * ixgbe: Enable Jumbo Frames on the X540 10Gigabit ControllerGreg Rose2011-02-243-3/+46
| | | | | | | | | | | | | | | | | | The X540 controller supports jumbo frames in SR-IOV mode. Allow configuration of jumbo frames either in the PF driver or on behalf of a VF. Signed-off-by: Greg Rose <gregory.v.rose@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* | ipv4: Rearrange how ip_route_newports() gets port keys.David S. Miller2011-02-243-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ip_route_newports() is the only place in the entire kernel that cares about the port members in the routing cache entry's lookup flow key. Therefore the only reason we store an entire flow inside of the struct rtentry is for this one special case. Rewrite ip_route_newports() such that: 1) The caller passes in the original port values, so we don't need to use the rth->fl.fl_ip_{s,d}port values to remember them. 2) The lookup flow is constructed by hand instead of being copied from the routing cache entry's flow. Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify xfrm_address_t args to xfrm_state_find.David S. Miller2011-02-232-4/+4
| | | | | | | | | | | | This required a const'ification in xfrm_init_tempstate() too. Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Remove unused 'saddr' and 'daddr' args to xfrm_state_look_at.David S. Miller2011-02-231-3/+2
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify xfrm_address_t args to __xfrm_state_lookup{,_byaddr}.David S. Miller2011-02-231-2/+8
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify xfrm_tmpl arg to xfrm_init_tempstate.David S. Miller2011-02-231-1/+1
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify xfrm_address_t args to xfrm_*_hash.David S. Miller2011-02-231-5/+6
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify sec_path arg to secpath_has_nontransport.David S. Miller2011-02-231-1/+1
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify ptr args to xfrm_policy_ok.David S. Miller2011-02-231-1/+1
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify ptr args to xfrm_state_ok.David S. Miller2011-02-231-1/+1
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify ptr args to xfrm_state_*_check and xfrm_state_kern.David S. Miller2011-02-231-12/+12
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify xfrm_tmpl and xfrm_state args to xfrm_state_addr_cmp.David S. Miller2011-02-231-3/+3
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify selector arg to xfrm_dst_update_parent.David S. Miller2011-02-231-1/+1
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify policy arg to clone_policy.David S. Miller2011-02-231-1/+1
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify policy arg to xp_net.David S. Miller2011-02-231-1/+1
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify policy arg and local selector in xfrm_policy_match.David S. Miller2011-02-231-2/+3
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify local xfrm_address_t pointers in xfrm_policy_lookup_bytype.David S. Miller2011-02-231-1/+1
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify selector args in xfrm_migrate paths.David S. Miller2011-02-232-5/+5
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify address args to hash helpers.David S. Miller2011-02-232-15/+26
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify pointer args to km_migrate() and implementations.David S. Miller2011-02-234-30/+34
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify pointer args to migrate_tmpl_match and xfrm_migrate_checkDavid S. Miller2011-02-231-2/+2
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify address argument to xfrm_addr_any()David S. Miller2011-02-231-1/+1
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify address arguments to xfrm_addr_cmp()David S. Miller2011-02-231-1/+2
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify address arguments to __xfrm_dst_lookup()David S. Miller2011-02-231-2/+2
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify address arguments to ->dst_lookup()David S. Miller2011-02-233-6/+6
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify selector argument to xfrm_selector_match()David S. Miller2011-02-232-4/+4
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Const'ify tmpl and address arguments to ->init_temprop()David S. Miller2011-02-233-6/+8
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | xfrm: Pass km_event pointers around as const when possible.David S. Miller2011-02-234-26/+26
|/ | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'tipc-Feb23-2011' of ↵David S. Miller2011-02-2319-469/+381
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6
| * tipc: Avoid reliable broadcast preparation for NACK messagesAllan Stephens2011-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Enhance TIPC to skip unnecessary (and, in some cases, redundant) preparation work when sending a broadcast link NACK message, since this preparation is only required for broadcast messages that are sent in a reliable manner. This change also fixes a bug that caused NACK messages to be improperly counted as "TX packets" in TIPC's broadcast link statistics. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| * tipc: Remove unused message header field for requested number of linksAllan Stephens2011-02-235-22/+5
| | | | | | | | | | | | | | | | | | Eliminates support for the "number of requested links" field in a neighbor discovery message. This field was never used and has been removed from the TIPC 2.0 protocol specification. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| * tipc: Remove support for per-connection message sequence numberingAllan Stephens2011-02-234-46/+3
| | | | | | | | | | | | | | | | | | | | | | Eliminates TIPC's prototype support for message sequence numbering on routable connections (i.e. connections requiring more than one hop). This capability isn't currently used, and can be removed since TIPC only supports systems in which all inter-node communication can be achieved in a single hop. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| * tipc: Add in missing lock during link initializationAllan Stephens2011-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | Ensure that the routine that starts up processing on a newly created link endpoint takes the spinlock of the node object that owns the link, to prevent possible conflicts with processing involving other links owned by that node object. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| * tipc: Fix port counter handling to correct congestion controlAllan Stephens2011-02-232-21/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifies TIPC's congestion control between a connected port and its peer so that it works as documented. The following changes have been made: 1) The counter of the number of messages sent by a port now starts at zero, rather than one. This prevents the port from reporting port congestion one message earlier than it was supposed to. 2) The counter of the number of messages sent by a port is now incremented only if a non-empty message is sent successfully. This prevents the port from becoming permanently congested if too many send attempts are unsuccessful because of congestion (or other reasons). It also removes the risk that empty hand- shaking messages used during connection setup might cause the port to report congestion earlier than it was supposed to. 3) The counter of the number of unacknowledged messages received by a port controlled by an internal TIPC service is now incremented only if the message is non-empty, in order to be consistent with the aforementioned changes. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| * tipc: Minor optimization to topology service connection establishmentAllan Stephens2011-02-231-3/+1
| | | | | | | | | | | | | | | | | | | | Eliminates a local iovec structure containing no data, which was previously used during the establishment of a topology service connection, since the same effect can be achieved by passing in a NULL pointer and an iovec length of zero. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| * tipc: Set unused probe field of link protocol messages to defined valueAllan Stephens2011-02-231-0/+1
| | | | | | | | | | | | | | | | | | Ensures that a link reset or activate message has a "probe" field of zero. (This field is currently unused in these messages, but this could potentially change in future versions of TIPC.) Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
OpenPOWER on IntegriCloud