lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	drivers/net/ucc_geth.c
This commit is contained in:
David S. Miller
2009-03-23 13:35:04 -07:00
parent ecd4137320 61fa9dcf93
commit 8be7cdccac
11 changed files with 113 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ucc_geth.h
View File

@@ -1101,8 +1101,7 @@ struct ucc_geth_info {
u32 eventRegMask;
u16 pausePeriod;
u16 extensionField;
u8 phy_address;
char mdio_bus[MII_BUS_ID_SIZE];
char phy_bus_id[BUS_ID_SIZE];
u8 weightfactor[NUM_TX_QUEUES];
u8 interruptcoalescingmaxvalue[NUM_RX_QUEUES];
u8 l2qt[UCC_GETH_VLAN_PRIORITY_MAX];