kernel/linux.git/drivers/net/fec.c, branch v3.0.91

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-03-04T05:27:42+00:00

Conflicts: drivers/net/bnx2x/bnx2x.h

net/fec: fix unterminated platform_device_id table

2011-02-28T20:35:44+00:00

The platform_device_id table is supposed to be zero-terminated. Signed-off-by: Axel Lin Signed-off-by: David S. Miller

net/fec: remove unused driver data

2011-02-17T20:47:24+00:00

Apart from not being used the first argument isn't even a struct platform_device *. Reported-by: Marc Kleine-Budde Signed-off-by: Uwe Kleine-König

net/fec: enable flow control and length check on enet-mac

2011-02-15T08:26:31+00:00

Also optimize not to reread the value written to FEC_R_CNTRL. Signed-off-by: Uwe Kleine-König

net/fec: postpone unsetting driver data until the hardware is stopped

2011-02-15T08:26:31+00:00

Reported-by: Lothar Waßmann Signed-off-by: Uwe Kleine-König

net/fec: provide device for dma functions and matching sizes for map and unmap

2011-02-15T08:26:30+00:00

This fixes warnings when CONFIG_DMA_API_DEBUG=y: NULL NULL: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x000000004781a020] [size=64 bytes] net eth0: DMA-API: device driver frees DMA memory with different size [device address=0x000000004781a020] [map size=2048 bytes] [unmap size=64 bytes] Moreover pass the platform device to dma_{,un}map_single which makes more sense because the logical network device doesn't know anything about dma. Passing the platform device was a suggestion by Lothar Waßmann. Signed-off-by: Uwe Kleine-König

net/fec: reorder functions a bit allows removing forward declarations

2011-02-15T08:26:30+00:00

Signed-off-by: Uwe Kleine-König

net/fec: some whitespace cleanup

2011-02-15T08:26:30+00:00

A few of these were found and reported by Lothar Waßmann. Signed-off-by: Uwe Kleine-König

net/fec: consistenly name struct net_device pointers "ndev"

2011-02-15T08:26:30+00:00

A variable named "dev" usually (usually subjective) points to a struct device. Signed-off-by: Uwe Kleine-König

net/fec: add phy_stop to fec_enet_close

2011-02-15T08:26:29+00:00

This undoes the effects of phy_start in fec_enet_open. Reported-by: Lothar Waßmann Signed-off-by: Uwe Kleine-König