提交 · ea18fd950e3210ec6d616e2e669550dd86f74d94 · openeuler / raspberrypi-kernel

24 2月, 2011 5 次提交

由 stephen hemminger 提交于 2月 23, 2011

* make qdisc_ops local
* add sparse annotation about expected unlock/unlock in dump_class_stats
* fix indentation
Signed-off-by: NStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

ea18fd95

afkey: add sparse annotation about rcu · ada440e3

由 stephen hemminger 提交于 2月 23, 2011

Signed-off-by: NStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

ada440e3

atl1[ce]: fix sparse warnings · 81b504b8

由 stephen hemminger 提交于 2月 23, 2011

The dmaw_block is an enum and max_pay_load is u32. Therefore
sparse gives warning about comparison of unsigned and signed value.
Resolve by using min_t to force cast.
Signed-off-by: NStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

81b504b8

socket: suppress sparse warnings · c3f52ae6

由 stephen hemminger 提交于 2月 23, 2011

Use __force to quiet sparse warnings for cases where the code
is simulating user space pointers.
Signed-off-by: NStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

c3f52ae6

net_sched: SFB flow scheduler · e13e02a3

由 Eric Dumazet 提交于 2月 23, 2011

This is the Stochastic Fair Blue scheduler, based on work from :

W. Feng, D. Kandlur, D. Saha, K. Shin. Blue: A New Class of Active Queue
Management Algorithms. U. Michigan CSE-TR-387-99, April 1999.

http://www.thefengs.com/wuchang/blue/CSE-TR-387-99.pdf

This implementation is based on work done by Juliusz Chroboczek

General SFB algorithm can be found in figure 14, page 15:

B[l][n] : L x N array of bins (L levels, N bins per level)
enqueue()
Calculate hash function values h{0}, h{1}, .. h{L-1}
Update bins at each level
for i = 0 to L - 1
   if (B[i][h{i}].qlen > bin_size)
      B[i][h{i}].p_mark += p_increment;
   else if (B[i][h{i}].qlen == 0)
      B[i][h{i}].p_mark -= p_decrement;
p_min = min(B[0][h{0}].p_mark ... B[L-1][h{L-1}].p_mark);
if (p_min == 1.0)
    ratelimit();
else
    mark/drop with probabilty p_min;

I did the adaptation of Juliusz code to meet current kernel standards,
and various changes to address previous comments :

http://thread.gmane.org/gmane.linux.network/90225
http://thread.gmane.org/gmane.linux.network/90375

Default flow classifier is the rxhash introduced by RPS in 2.6.35, but
we can use an external flow classifier if wanted.

tc qdisc add dev $DEV parent 1:11 handle 11:  \
        est 0.5sec 2sec sfb limit 128

tc filter add dev $DEV protocol ip parent 11: handle 3 \
        flow hash keys dst divisor 1024

Notes:

1) SFB default child qdisc is pfifo_fast. It can be changed by another
qdisc but a child qdisc MUST not drop a packet previously queued. This
is because SFB needs to handle a dequeued packet in order to maintain
its virtual queue states. pfifo_head_drop or CHOKe should not be used.

2) ECN is enabled by default, unlike RED/CHOKe/GRED

With help from Patrick McHardy & Andi Kleen
Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
CC: Juliusz Chroboczek <Juliusz.Chroboczek@pps.jussieu.fr>
CC: Stephen Hemminger <shemminger@vyatta.com>
CC: Patrick McHardy <kaber@trash.net>
CC: Andi Kleen <andi@firstfloor.org>
CC: John W. Linville <linville@tuxdriver.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

e13e02a3

23 2月, 2011 32 次提交
- D
  net: Make flow cache paths use a const struct flowi. · dee9f4bc
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  dee9f4bc
- D
  xfrm: Mark flowi arg to xfrm_resolve_and_create_bundle() const. · 4ca2e685
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  4ca2e685
- D
  xfrm: Mark flowi arg to xfrm_dst_{alloc_copy,update_origin}() const. · 3f0e18fb
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  3f0e18fb
- D
  xfrm: Mark flowi arg to xfrm_bundle_create() const. · 98313ada
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  98313ada
- D
  xfrm: Mark flowi arg to xfrm_tmpl_resolve{,_one}() const. · a6c2e611
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  a6c2e611
- D
  xfrm: Mark flowi arg to xfrm_expand_policies() const. · 73ff93cd
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  73ff93cd
- D
  xfrm: Mark flowi arg to xfrm_policy_{lookup_by_type,match}() const. · 062cdb43
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  062cdb43
- D
  xfrm: Kill strict arg to xfrm_bundle_ok(). · 47209abd
  由 David S. Miller 提交于 2月 22, 2011
```
Always set to "0".
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  47209abd
- D
  net: Mark flowi arg to flow_cache_uli_match() const. · 0730b9a1
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  0730b9a1
- D
  xfrm: Mark flowi arg to xfrm_state_find() const. · b520e9f6
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  b520e9f6
- D
  xfrm: Mark flowi arg to xfrm_init_tempstate() const. · 1a898592
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  1a898592
- D
  xfrm: Mark flowi arg to xfrm_state_look_at() const. · 4a08ab0f
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  4a08ab0f
- D
  xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const. · e33f7704
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  e33f7704
- D
  xfrm: Mark flowi arg to xfrm_selector_match() const. · e1ad2ab2
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  e1ad2ab2
- D
  xfrm: Mark token args to addr_match() const. · 1744a8fe
  由 David S. Miller 提交于 2月 22, 2011
```
Also, make it return a real bool.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  1744a8fe
- D
  xfrm: Mark flowi arg to xfrm_type->reject() const. · 8f029de2
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  8f029de2
- D
  xfrm: Mark flowi arg to ->init_tempsel() const. · 73e5ebb2
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  73e5ebb2
- D
  xfrm: Mark flowi arg to ->fill_dst() const. · 0c7b3eef
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  0c7b3eef
- D
  xfrm: Mark flowi arg to ->get_tos() const. · 05d84025
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  05d84025
- D
  xfrm: Mark flowi arg const in key extraction helpers. · e8a4e377
  由 David S. Miller 提交于 2月 22, 2011
```
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  e8a4e377
- S
  cls_u32: fix sparse warnings · 86fce3ba
  由 stephen hemminger 提交于 2月 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: NStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  86fce3ba
- D
  
  Merge branch 'net/ax88796' of git://git.pengutronix.de/git/mkl/linux-2.6 · db62983a
  由 David S. Miller 提交于 2月 22, 2011
  
  db62983a
- A
  be2net: use hba_port_num instead of port_num · 9e1453c5
  由 Ajit Khaparde 提交于 2月 20, 2011
```
Use hba_port_num for phy loopback and ethtool phy identification.

From: Suresh R <suresh.reddy@emulex.com>
Signed-off-by: NAjit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  9e1453c5
- A
  be2net: add code to display temperature of ASIC · 609ff3bb
  由 Ajit Khaparde 提交于 2月 20, 2011
```
Add support to display temperature of ASIC via ethtool -S

From: Somnath K <somnath.kotur@emulex.com>
Signed-off-by: NAjit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  609ff3bb
- A
  be2net: fix to ignore transparent vlan ids wrongly indicated by NIC · 3968fa1e
  由 Ajit Khaparde 提交于 2月 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: NAjit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  3968fa1e
- A
  be2net: variable name change · b2aebe6d
  由 Ajit Khaparde 提交于 2月 20, 2011
```
change occurances of stats_ioctl_sent to stats_cmd_sent
Signed-off-by: NAjit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  b2aebe6d
- A
  be2net: fixes in ethtool selftest · 4ee77214
  由 Ajit Khaparde 提交于 2月 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: NAjit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  4ee77214
- A
  be2net: add new counters to display via ethtool stats · f6c4bf3e
  由 Ajit Khaparde 提交于 2月 20, 2011
```
New counters:
	> jabber frame stats
	> red drop stats
Signed-off-by: NAjit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  f6c4bf3e
- D
  
  Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 · 2a3bcfdd
  由 David S. Miller 提交于 2月 22, 2011
  
  2a3bcfdd
- E
  net: add __rcu annotations to sk_wq and wq · eaefd110
  由 Eric Dumazet 提交于 2月 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: NEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  eaefd110
- D
  
  Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6 · 04cfa852
  由 David S. Miller 提交于 2月 22, 2011
  
  04cfa852
- N
  sh: sh_eth: Add support ethtool · dc19e4e5
  由 Nobuhiro Iwamatsu 提交于 2月 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: NYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: NNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
```
  dc19e4e5
21 2月, 2011 3 次提交
- M
  ax88796: use generic mdio_bitbang driver · f6d7f2c6
  由 Marc Kleine-Budde 提交于 2月 21, 2011
```
..instead of using hand-crafted and not proper working version.
Signed-off-by: NMarc Kleine-Budde <mkl@pengutronix.de>
```
  f6d7f2c6
- M
  ax88796: clean up probe and remove function · c9218c3a
  由 Marc Kleine-Budde 提交于 2月 21, 2011
```
This way we can remove the struct resource pointers from the private data.
Signed-off-by: NMarc Kleine-Budde <mkl@pengutronix.de>
```
  c9218c3a
- M
  ax88796: make pointer to platform data const · a54dc585
  由 Marc Kleine-Budde 提交于 2月 21, 2011
```
Signed-off-by: NMarc Kleine-Budde <mkl@pengutronix.de>
```
  a54dc585