Commits · 73ff93cd0249e822c4fee367e1fd4ad4a45a5515 · Kirill Smelkov / linux

23 Feb, 2011 15 commits
- xfrm: Mark flowi arg to xfrm_expand_policies() const. · 73ff93cd
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  73ff93cd
- xfrm: Mark flowi arg to xfrm_policy_{lookup_by_type,match}() const. · 062cdb43
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  062cdb43
- xfrm: Kill strict arg to xfrm_bundle_ok(). · 47209abd
  David S. Miller authored Feb 22, 2011
```
Always set to "0".
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  47209abd
- net: Mark flowi arg to flow_cache_uli_match() const. · 0730b9a1
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  0730b9a1
- xfrm: Mark flowi arg to xfrm_state_find() const. · b520e9f6
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  b520e9f6
- xfrm: Mark flowi arg to xfrm_init_tempstate() const. · 1a898592
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  1a898592
- xfrm: Mark flowi arg to xfrm_state_look_at() const. · 4a08ab0f
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  4a08ab0f
- xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const. · e33f7704
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  e33f7704
- xfrm: Mark flowi arg to xfrm_selector_match() const. · e1ad2ab2
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  e1ad2ab2
- xfrm: Mark token args to addr_match() const. · 1744a8fe
  David S. Miller authored Feb 22, 2011
```
Also, make it return a real bool.
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  1744a8fe
- xfrm: Mark flowi arg to xfrm_type->reject() const. · 8f029de2
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  8f029de2
- xfrm: Mark flowi arg to ->init_tempsel() const. · 73e5ebb2
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  73e5ebb2
- xfrm: Mark flowi arg to ->fill_dst() const. · 0c7b3eef
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  0c7b3eef
- xfrm: Mark flowi arg to ->get_tos() const. · 05d84025
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  05d84025
- xfrm: Mark flowi arg const in key extraction helpers. · e8a4e377
  David S. Miller authored Feb 22, 2011
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
  e8a4e377
22 Feb, 2011 12 commits

stephen hemminger authored Feb 20, 2011

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>

86fce3ba

Merge branch 'net/ax88796' of git://git.pengutronix.de/git/mkl/linux-2.6 · db62983a
David S. Miller authored Feb 22, 2011

db62983a

be2net: use hba_port_num instead of port_num · 9e1453c5

Ajit Khaparde authored Feb 20, 2011

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>

9e1453c5

be2net: add code to display temperature of ASIC · 609ff3bb

Ajit Khaparde authored Feb 20, 2011

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>

609ff3bb

be2net: fix to ignore transparent vlan ids wrongly indicated by NIC · 3968fa1e

Ajit Khaparde authored Feb 20, 2011

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>

3968fa1e

be2net: variable name change · b2aebe6d

Ajit Khaparde authored Feb 20, 2011

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>

b2aebe6d

be2net: fixes in ethtool selftest · 4ee77214

Ajit Khaparde authored Feb 20, 2011

> 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>

4ee77214

be2net: add new counters to display via ethtool stats · f6c4bf3e

Ajit Khaparde authored Feb 20, 2011

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>

f6c4bf3e

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 · 2a3bcfdd
David S. Miller authored Feb 22, 2011

2a3bcfdd

net: add __rcu annotations to sk_wq and wq · eaefd110

Eric Dumazet authored Feb 18, 2011

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>

eaefd110

Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6 · 04cfa852
David S. Miller authored Feb 22, 2011

04cfa852

sh: sh_eth: Add support ethtool · dc19e4e5

Nobuhiro Iwamatsu authored Feb 15, 2011

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>

dc19e4e5

21 Feb, 2011 9 commits
- ax88796: use generic mdio_bitbang driver · f6d7f2c6
  Marc Kleine-Budde authored Feb 21, 2011
```
..instead of using hand-crafted and not proper working version.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
```
  f6d7f2c6
- ax88796: clean up probe and remove function · c9218c3a
  Marc Kleine-Budde authored Feb 21, 2011
```
This way we can remove the struct resource pointers from the private data.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
```
  c9218c3a
- ax88796: make pointer to platform data const · a54dc585
  Marc Kleine-Budde authored Feb 21, 2011
```
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
```
  a54dc585
- ax88796: remove platform_device member from struct ax_device · 0f442f5a
  Marc Kleine-Budde authored Feb 20, 2011
```
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
```
  0f442f5a
- ax88796: use netdev_<LEVEL> instead of dev_<LEVEL> and pr_<LEVEL> · 85ac6162
  Marc Kleine-Budde authored Feb 20, 2011
```
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
```
  85ac6162
- ax88796: remove first_init parameter from ax_init_dev() · 1cbece33
  Marc Kleine-Budde authored Feb 19, 2011
```
ax_init_dev() is always called with first_init=1.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
```
  1cbece33
- ax88796: remove memset of private data · 2f9709db
  Marc Kleine-Budde authored Feb 19, 2011
```
It's allocated via alloc_netdev, thus already zeroed.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
```
  2f9709db
- ax88796: don't use magic ei_status to acces private data · ea5a43db
  Marc Kleine-Budde authored Feb 19, 2011
```
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
```
  ea5a43db
- ax88796: fix codingstyle and checkpatch warnings · 9f072429
  Marc Kleine-Budde authored Feb 19, 2011
```
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
```
  9f072429
20 Feb, 2011 4 commits

sctp: fix compile warnings in sctp_tsnmap_num_gabs · 59ed5aba

Shan Wei authored Feb 19, 2011

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>

59ed5aba

tcp: Remove debug macro of TCP_CHECK_TIMER · 089c3482

Shan Wei authored Feb 19, 2011

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>

089c3482

tcp: document tcp_max_ssthresh (Limited Slow-Start) · 81146ec1

Ilpo Järvinen authored Feb 19, 2011

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>

81146ec1

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · da935c66
David S. Miller authored Feb 19, 2011
```
Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/e1000e/netdev.c
	net/xfrm/xfrm_policy.c
```
da935c66