提交 · 6498be3fba7b102132241be5763263e8e8bf6f9e · Linux-御风守护者 / linux

17 4月, 2009 8 次提交

myri10ge: fix tx ring size in ethtool -g · 6498be3f

由 Brice Goglin 提交于 4月 16, 2009

Fix tx ring size reported via ethtool -g.
Signed-off-by: NBrice Goglin <brice@myri.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

6498be3f

myri10ge: add MODULE_DEVICE_TABLE · 97131079

由 Brice Goglin 提交于 4月 16, 2009

Add MODULE_DEVICE_TABLE so that modinfo reports pci device id aliases.
Signed-off-by: NBrice Goglin <brice@myri.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

97131079

myri10ge: allow per-board firmware overriding · 2d90b0aa

由 Brice Goglin 提交于 4月 16, 2009

Add myri10ge_fw_names to override the default firmware
on a per-board basis.
Signed-off-by: NBrice Goglin <brice@myri.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

2d90b0aa

myri10ge: force stats update in ethtool gstats · 59081825

由 Brice Goglin 提交于 4月 16, 2009

Force a statistics update when our ethtool gstats routine
is called.  Otherwise, ethtool will continue to read stale
stats until something forces an update by reading /proc/net/dev

This requires putting a lock around the stats update to guard
against 2 threads (one via ethtool, and one via procfs)
updating the stats at once.
Signed-off-by: NBrice Goglin <brice@myri.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

59081825

D

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · a54bfa40
由 David S. Miller 提交于 4月 16, 2009

a54bfa40
D

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 · 134ffb4c
由 David S. Miller 提交于 4月 16, 2009

134ffb4c

ixgbe: Be explict with what we are !'ing in ixgbe_sfp_config_module_task() · 2238aff5

由 Tony Breeds 提交于 4月 16, 2009

GCC warns:
drivers/net/ixgbe/ixgbe_main.c: In function 'ixgbe_sfp_config_module_task':
drivers/net/ixgbe/ixgbe_main.c:3920: warning: suggest parantheses around
operand of '!' or change '&' to '&&' or '!' to '~'

Which I think is right.  Bracket to remove ambiguity.
Signed-off-by: NTony Breeds <tony@bakeyournoodle.com>
Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

2238aff5

netfilter: nf_nat: add support for persistent mappings · 98d500d6

由 Patrick McHardy 提交于 4月 16, 2009

The removal of the SAME target accidentally removed one feature that is
not available from the normal NAT targets so far, having multi-range
mappings that use the same mapping for each connection from a single
client. The current behaviour is to choose the address from the range
based on source and destination IP, which breaks when communicating
with sites having multiple addresses that require all connections to
originate from the same IP address.

Introduce a IP_NAT_RANGE_PERSISTENT option that controls whether the
destination address is taken into account for selecting addresses.

http://bugzilla.kernel.org/show_bug.cgi?id=12954Signed-off-by: NPatrick McHardy <kaber@trash.net>

98d500d6

16 4月, 2009 32 次提交

phylib: Fix delay argument of schedule_delayed_work · 3664090e

由 Atsushi Nemoto 提交于 4月 16, 2009

The commit a390d1f3 ("phylib: convert state_queue work to
delayed_work") missed converting 'expires' value to 'delay' value.
Signed-off-by: NAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: NMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

3664090e

fec: call fec_restart() in fec_open() · fe957c40