On Sat, 2010-07-03 at 13:08 -0700, Roland Dreier wrote: > > Following commit 1437ce3983bcbc0447a0dedcd644c14fe833d266 "ethtool: > > Change ethtool_op_set_flags to validate flags", ethtool_op_set_flags > > takes a third parameter and cannot be used directly as an > > implementation of ethtool_ops::set_flags. > > I assume this commit is in one of Dave's trees and breaks nes and ipoib > because it changed the ethtool_op_set_flags prototype?
Right. > > Dave, Roland, you'd better decide between yourselves should apply this. > > Since this depends on a commit already in Dave's tree, Dave should > probably take it into the same tree. I guess there's no way to roll > this into the original patch to avoid breaking bisects once this ends up > upstream? Unfortunately it's too late to do that. > anyway, > > Acked-by: Roland Dreier <rola...@cisco.com> > > > +static int nes_netdev_set_flags(struct net_device *netdev, u32 flags) > > +{ > > + return ethtool_op_set_flags(netdev, flags, ETH_FLAG_LRO); > > +} > > + > > + > > static const struct ethtool_ops nes_ethtool_ops = { > > Also would have been a bit nicer to avoid adding a double blank line > here, although that's obviously a trivial issue. This spacing is consistent with the surrounding code. Ben. -- Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html