summaryrefslogtreecommitdiffstats
path: root/drivers/net/niu.h
AgeCommit message (Collapse)AuthorFilesLines
2008-05-15Merge branch 'master' of ↵David S. Miller1-0/+9
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-4965-rs.c drivers/net/wireless/rt2x00/rt61pci.c
2008-05-13[netdrvr] Trim trailing whitespace for several driversJeff Garzik1-1/+1
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
2008-05-12niu: Determine the # of ports from the card's VPD dataMatheos Worku1-0/+9
Determine the number of physical ports from the card's VPD data. Previous fix failed on Maramba platform which doesn't have the "board-model" property. This fix uses the "model" property which exists on all cards and Neptune based motherboards. cstyle cleanup included. Signed-off-by: Matheos Worku <matheos.worku@sun.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2008-04-24niu: Add support for Neptune FEM/NEM cards for C10 server bladesMatheos Worku1-0/+3
[ Minor coding style and whitespace corrections, also bump driver version and release date. -DaveM ] Signed-off-by: Matheos Worku <matheos.worku@sun.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2008-04-24niu: Determine the # of ports from the card's VPD dataMatheos Worku1-0/+9
[ Fix minor whitespace and coding style stuff... -DaveM ] Signed-off-by: Matheos Worku <matheos.worku@sun.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-28[NIU]: Add Support for Sun ATCA Blade Server.Matheos Worku1-1/+3
Ports 0 and 1 of the NIU device are connected to extended fabric through SERDES. Ports 2 and 3 are connected using RGMII Fiber mode. [ Coding style cleanups... -DaveM ] Signed-off-by: Matheos Worku <matheos.worku@sun.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-20[NIU]: More BMAC alt MAC address fixes.Matheos Worku1-1/+1
From: Matheos Worku <Matheos.Worku@Sun.COM> 1) niu_enable_alt_mac() needs to be adjusted so that the mask is computed properly for the BMAC case. 2) BMAC has 6 alt MAC addresses available, not 7. Signed-off-by: David S. Miller <davem@davemloft.net>
2008-01-10[NIU]: Support for Marvell PHYMirko Lindner1-0/+33
From: Mirko Lindner <mlindner@marvell.com> This patch makes necessary changes in the Neptune driver to support the new Marvell PHY. It also adds support for the LED blinking on Neptune cards with Marvell PHY. All registers are using defines in the niu.h header file as is already done for the BCM8704 registers. [ Coding style, etc. cleanups -DaveM ] Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-10[NIU]: Add Sun Neptune ethernet driver.David S. Miller1-0/+3222
With cleanup suggestions and bugs spotted by Stephen Hemminger, Ingo Oeser, Matheos Worku, and Oliver Hartkopp. Signed-off-by: David S. Miller <davem@davemloft.net>