Commits · f6a2629353718e588820b731af43a445b6f35648 · nexedi / linux

17 Apr, 2009 6 commits

irda: include etherdevice.h for eth_*() functions · f6a26293

Alexander Beregalov authored Apr 16, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

f6a26293

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

Brice Goglin authored Apr 16, 2009

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

6498be3f

myri10ge: add MODULE_DEVICE_TABLE · 97131079

Brice Goglin authored Apr 16, 2009

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

97131079

myri10ge: allow per-board firmware overriding · 2d90b0aa

Brice Goglin authored Apr 16, 2009

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

2d90b0aa

myri10ge: force stats update in ethtool gstats · 59081825

Brice Goglin authored Apr 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: Brice Goglin <brice@myri.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

59081825

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · a54bfa40
David S. Miller authored Apr 16, 2009

a54bfa40

16 Apr, 2009 34 commits

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 · 134ffb4c
David S. Miller authored Apr 16, 2009

134ffb4c

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

Tony Breeds authored Apr 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: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2238aff5

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

Patrick McHardy authored Apr 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: Patrick McHardy <kaber@trash.net>

98d500d6

phylib: Fix delay argument of schedule_delayed_work · 3664090e

Atsushi Nemoto authored Apr 16, 2009

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

3664090e

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

Sascha Hauer authored Apr 15, 2009

We called fec_stop() in fec_enet_close(), thus we have to call
fec_restart() in fec_enet_open().
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

fe957c40

FEC Buffer rework · f0b3fbea

Sascha Hauer authored Apr 15, 2009

Allocate buffers in fec_open and free them again in fec_close. This makes
it possible to use this driver as a module.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

f0b3fbea

fec: switch to net_device_ops · 009fda83

Sascha Hauer authored Apr 15, 2009

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

009fda83

fec: remove debugging printks · 3644ee00

Sascha Hauer authored Apr 15, 2009

These printks in fec_timeout do not give useful information in
a production kernel.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

3644ee00

fec: align receive packets · 8549889c

Sascha Hauer authored Apr 15, 2009

Otherwise we get a lot of alignment errors
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

8549889c

fec: refactor init function · 4f1ceb4b

Sascha Hauer authored Apr 15, 2009

fec_enet_init() does the hardware initialisation and then calls
fec_restart() which does the same initialisation again, so we
can safely remove the initialisation from fec_enet_init().
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

4f1ceb4b

fec: refactor set_multicast_list() to make it more readable · 4e831836

Sascha Hauer authored Apr 15, 2009

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

4e831836

fec: Codingstyle cleanups · 22f6b860

Sascha Hauer authored Apr 15, 2009

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

22f6b860

fec: remove unnecessary cast · 8d4dd5cf

Sascha Hauer authored Apr 15, 2009

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

8d4dd5cf

fec: do not typedef struct types · 2e28532f

Sascha Hauer authored Apr 15, 2009

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

2e28532f

fec: switch to writel/readl · f44d6305

Sascha Hauer authored Apr 15, 2009

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

f44d6305

sun3lance: convert to net_device_ops · 2160187a

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2160187a

smc911x: convert to net_device_ops · ec4e0cff

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

ec4e0cff

sgiseeq: convert to net_device_ops · 8c2c6be1

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

8c2c6be1

sb1250-mac: convert to net_device_ops · b4cf3421

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

b4cf3421

rionet: convert to net_device_ops · a33a2bb3

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

a33a2bb3

pci-skeleton: convert to net_device_ops · 1ec847f6

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1ec847f6

pasemi_mac: convert to net_device_ops · 9e0ac841

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

9e0ac841

netx-eth: convert to net_device_ops · cd732de2

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

cd732de2

mvme147: convert to net_device_ops · 96cd55ea

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

96cd55ea

mipsnet: convert to net_device_ops · d6771e0b

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

d6771e0b

meth: convert to net_device_ops · d53bc2df

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

d53bc2df

macmace: convert to net_device_ops · 0d3936a8

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

0d3936a8

mace: convert to net_device_ops · 488b4abc

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

488b4abc

lib82596: convert to net_device_ops · 71f4367c

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

71f4367c

korina: convert to net_device_ops · 52b031ff

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

52b031ff

jazzsonic: convert to net_device_ops · 502a326f

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

502a326f

ixp2000/ixpdev: convert to net_device_ops · e7090e34

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

e7090e34

iseries_veth: convert to net_device_ops · c2775360

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

c2775360

irda/sa1100_ir: convert to net_device_ops · a1de9666

Alexander Beregalov authored Apr 15, 2009

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

a1de9666