diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /include/linux/ethtool.h | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'include/linux/ethtool.h')
| -rw-r--r-- | include/linux/ethtool.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index b297f288f6e..ae757bcf128 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h | |||
| @@ -648,6 +648,9 @@ enum ethtool_sfeatures_retval_bits { | |||
| 648 | 648 | ||
| 649 | #include <linux/rculist.h> | 649 | #include <linux/rculist.h> |
| 650 | 650 | ||
| 651 | /* needed by dev_disable_lro() */ | ||
| 652 | extern int __ethtool_set_flags(struct net_device *dev, u32 flags); | ||
| 653 | |||
| 651 | struct ethtool_rx_ntuple_flow_spec_container { | 654 | struct ethtool_rx_ntuple_flow_spec_container { |
| 652 | struct ethtool_rx_ntuple_flow_spec fs; | 655 | struct ethtool_rx_ntuple_flow_spec fs; |
| 653 | struct list_head list; | 656 | struct list_head list; |