diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-09 02:00:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-09 02:00:54 -0500 |
| commit | d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4 (patch) | |
| tree | daab7cc0db83226672f76d2fc9277e4355f89e6b /drivers/net/benet/be.h | |
| parent | 9e0d57fd6dad37d72a3ca6db00ca8c76f2215454 (diff) | |
| parent | 2606289779cb297320a185db5997729d29b6700b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/usb/ems_usb.c
Diffstat (limited to 'drivers/net/benet/be.h')
| -rw-r--r-- | drivers/net/benet/be.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index ce7563175cef..67e165cf3f4e 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h | |||
| @@ -269,6 +269,8 @@ struct be_adapter { | |||
| 269 | u32 port_num; | 269 | u32 port_num; |
| 270 | bool promiscuous; | 270 | bool promiscuous; |
| 271 | u32 cap; | 271 | u32 cap; |
| 272 | u32 rx_fc; /* Rx flow control */ | ||
| 273 | u32 tx_fc; /* Tx flow control */ | ||
| 272 | }; | 274 | }; |
| 273 | 275 | ||
| 274 | extern const struct ethtool_ops be_ethtool_ops; | 276 | extern const struct ethtool_ops be_ethtool_ops; |