summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tipc: Combine port structure with tipc_port structureAllan Stephens2011-02-235-184/+175
| | | | | | | | | | | | | | | | | Merge two distinct structures containing information about a TIPC port into a single structure. The structures were previously kept separate so that public information about a port could be made available to applications using TIPC's native API, while the remaining information was kept private for use by TIPC itself. However, now that the native API has been removed there is no longer any need for this somewhat confusing arrangement. Since one of the structures was already embedded within the other, the change largely involves replacing instances of "publ.foo" with "foo". The changes do not otherwise alter the operation of TIPC ports. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
* net: Make flow cache paths use a const struct flowi.David S. Miller2011-02-224-18/+23
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to xfrm_resolve_and_create_bundle() const.David S. Miller2011-02-221-1/+1
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to xfrm_dst_{alloc_copy,update_origin}() const.David S. Miller2011-02-221-2/+2
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to xfrm_bundle_create() const.David S. Miller2011-02-221-1/+1
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to xfrm_tmpl_resolve{,_one}() const.David S. Miller2011-02-221-6/+4
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to xfrm_expand_policies() const.David S. Miller2011-02-221-2/+2
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to xfrm_policy_{lookup_by_type,match}() const.David S. Miller2011-02-221-2/+2
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Kill strict arg to xfrm_bundle_ok().David S. Miller2011-02-221-8/+3
| | | | | | Always set to "0". Signed-off-by: David S. Miller <davem@davemloft.net>
* net: Mark flowi arg to flow_cache_uli_match() const.David S. Miller2011-02-221-1/+2
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to xfrm_state_find() const.David S. Miller2011-02-222-3/+5
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to xfrm_init_tempstate() const.David S. Miller2011-02-221-1/+1
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to xfrm_state_look_at() const.David S. Miller2011-02-221-1/+1
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const.David S. Miller2011-02-225-7/+9
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to xfrm_selector_match() const.David S. Miller2011-02-222-5/+6
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark token args to addr_match() const.David S. Miller2011-02-221-6/+7
| | | | | | Also, make it return a real bool. Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to xfrm_type->reject() const.David S. Miller2011-02-223-3/+5
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to ->init_tempsel() const.David S. Miller2011-02-223-3/+4
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to ->fill_dst() const.David S. Miller2011-02-224-4/+4
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg to ->get_tos() const.David S. Miller2011-02-224-4/+4
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* xfrm: Mark flowi arg const in key extraction helpers.David S. Miller2011-02-221-6/+6
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* cls_u32: fix sparse warningsstephen hemminger2011-02-221-6/+6
| | | | | | | | The variable _data is used in asm-generic to define sections which causes sparse warnings, so just rename the variable. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'net/ax88796' of git://git.pengutronix.de/git/mkl/linux-2.6David S. Miller2011-02-222-419/+395
|\
| * ax88796: use generic mdio_bitbang driverMarc Kleine-Budde2011-02-212-200/+196
| | | | | | | | | | | | ..instead of using hand-crafted and not proper working version. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * ax88796: clean up probe and remove functionMarc Kleine-Budde2011-02-211-44/+31
| | | | | | | | | | | | This way we can remove the struct resource pointers from the private data. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * ax88796: make pointer to platform data constMarc Kleine-Budde2011-02-211-1/+1
| | | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * ax88796: remove platform_device member from struct ax_deviceMarc Kleine-Budde2011-02-211-4/+2
| | | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * ax88796: use netdev_<LEVEL> instead of dev_<LEVEL> and pr_<LEVEL>Marc Kleine-Budde2011-02-211-26/+20
| | | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * ax88796: remove first_init parameter from ax_init_dev()Marc Kleine-Budde2011-02-211-25/+19
| | | | | | | | | | | | ax_init_dev() is always called with first_init=1. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * ax88796: remove memset of private dataMarc Kleine-Budde2011-02-211-2/+0
| | | | | | | | | | | | It's allocated via alloc_netdev, thus already zeroed. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * ax88796: don't use magic ei_status to acces private dataMarc Kleine-Budde2011-02-211-39/+42
| | | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * ax88796: fix codingstyle and checkpatch warningsMarc Kleine-Budde2011-02-211-128/+134
| | | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
* | be2net: use hba_port_num instead of port_numAjit Khaparde2011-02-226-6/+124
| | | | | | | | | | | | | | | | Use hba_port_num for phy loopback and ethtool phy identification. From: Suresh R <suresh.reddy@emulex.com> Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | be2net: add code to display temperature of ASICAjit Khaparde2011-02-224-2/+76
| | | | | | | | | | | | | | | | Add support to display temperature of ASIC via ethtool -S From: Somnath K <somnath.kotur@emulex.com> Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | be2net: fix to ignore transparent vlan ids wrongly indicated by NICAjit Khaparde2011-02-224-0/+34
| | | | | | | | | | | | | | | | | | With transparent VLAN tagging, the ASIC wrongly indicates packets with VLAN ID. Strip them off in the driver. The VLAN Tag to be stripped will be given to the host as an async message. Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | be2net: variable name changeAjit Khaparde2011-02-223-4/+4
| | | | | | | | | | | | | | change occurances of stats_ioctl_sent to stats_cmd_sent Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | be2net: fixes in ethtool selftestAjit Khaparde2011-02-221-2/+3
| | | | | | | | | | | | | | | | | | | | > add missing separator between items in ethtool self_test array > fix reporting of test resluts when link is down and when selftest command fails. From: Suresh R <suresh.reddy@emulex.com> Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | be2net: add new counters to display via ethtool statsAjit Khaparde2011-02-222-4/+21
| | | | | | | | | | | | | | | | | | New counters: > jabber frame stats > red drop stats Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'for-davem' of ↵David S. Miller2011-02-225-7/+180
|\ \ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
| * | sfc: Implement hardware acceleration of RFSBen Hutchings2011-02-174-2/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the existing filter management functions to insert TCP/IPv4 and UDP/IPv4 4-tuple filters for Receive Flow Steering. For each channel, track how many RFS filters are being added during processing of received packets and scan the corresponding number of table entries for filters that may be reclaimed. Do this in batches to reduce lock overhead. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
| * | sfc: Limit filter search depth further for performance hints (i.e. RFS)Ben Hutchings2011-02-161-4/+9
| | | | | | | | | | | | Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
| * | net: RPS: Make hardware-accelerated RFS conditional on NETIF_F_NTUPLEBen Hutchings2011-02-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | For testing and debugging purposes it is useful to be able to disable hardware acceleration of RFS without disabling RFS altogether. Since this is a similar feature to 'n-tuple' flow steering through the ethtool API, test the same feature flag that controls that. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
* | | net: add __rcu annotations to sk_wq and wqEric Dumazet2011-02-226-30/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add proper RCU annotations/verbs to sk_wq and wq members Fix __sctp_write_space() sk_sleep() abuse (and sock->wq access) Fix sunrpc sk_sleep() abuse too Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6David S. Miller2011-02-221-2/+0
|\ \ \
| * | | net/fec: remove unused driver dataUwe Kleine-König2011-02-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apart from not being used the first argument isn't even a struct platform_device *. Reported-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* | | | sh: sh_eth: Add support ethtoolNobuhiro Iwamatsu2011-02-221-19/+189
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit supports following functions. - get_settings - set_settings - nway_reset - get_msglevel - set_msglevel - get_link - get_strings - get_ethtool_stats - get_sset_count About other function, the device does not support. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | sctp: fix compile warnings in sctp_tsnmap_num_gabsShan Wei2011-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | net/sctp/tsnmap.c: In function ‘sctp_tsnmap_num_gabs’: net/sctp/tsnmap.c:347: warning: ‘start’ may be used uninitialized in this function net/sctp/tsnmap.c:347: warning: ‘end’ may be used uninitialized in this function Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | tcp: Remove debug macro of TCP_CHECK_TIMERShan Wei2011-02-205-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, TCP_CHECK_TIMER is not used for debuging, it does nothing. And, it has been there for several years, maybe 6 years. Remove it to keep code clearer. Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | tcp: document tcp_max_ssthresh (Limited Slow-Start)Ilpo Järvinen2011-02-201-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base on Ilpo's patch about documenting tcp_max_ssthresh. (see http://marc.info/?l=linux-netdev&m=117950581307310&w=2) According to errata of RFC3742, fix the number of segments increased during RTT time. Just to state the occasion to use this parameter, But about how to set parameter value, maybe some others can do it. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Merge branch 'master' of ↵David S. Miller2011-02-19936-7423/+10332
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: Documentation/feature-removal-schedule.txt drivers/net/e1000e/netdev.c net/xfrm/xfrm_policy.c
OpenPOWER on IntegriCloud