forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	drivers/net/can/usb/ems_usb.c
This commit is contained in:
David S. Miller 2009-11-08 23:00:54 -08:00
commit d0e1e88d6e
23 changed files with 259 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/benet/be.h
View file

@ -269,6 +269,8 @@ struct be_adapter {
u32 port_num;
bool promiscuous;
u32 cap;
u32 rx_fc; /* Rx flow control */
u32 tx_fc; /* Tx flow control */
};
extern const struct ethtool_ops be_ethtool_ops;