diff --git a/[refs] b/[refs] index cea0516565fc..6e813772988e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44c14c1d4cf9b6ef4993c4a69f479d1f13cb8b21 +refs/heads/master: b4f79e5cb2182f27d151da6e223186f287a615d6 diff --git a/trunk/include/linux/ethtool.h b/trunk/include/linux/ethtool.h index e1d9e0ede309..f5647b59a90e 100644 --- a/trunk/include/linux/ethtool.h +++ b/trunk/include/linux/ethtool.h @@ -896,8 +896,7 @@ static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings) * * All operations are optional (i.e. the function pointer may be set * to %NULL) and callers must take this into account. Callers must - * hold the RTNL, except that for @get_drvinfo the caller may or may - * not hold the RTNL. + * hold the RTNL lock. * * See the structures used by these operations for further documentation. *