On Wed, 2011-03-23 at 14:30 -0700, Greg KH wrote: > On Tue, Mar 22, 2011 at 06:05:02PM +0000, James Bottomley wrote: > > commit: 3a7da39d165e0c363c294feec119db1427032afd > > From: Ben Hutchings <[email protected]> > > Date: Thu, 17 Mar 2011 07:34:32 +0000 > > Subject: [PATCH] ethtool: Compat handling for struct ethtool_rxnfc > > > > This structure was accidentally defined such that its layout can > > differ between 32-bit and 64-bit processes. Add compat structure > > definitions and an ioctl wrapper function. > > > > Signed-off-by: Ben Hutchings <[email protected]> > > Acked-by: Alexander Duyck <[email protected]> > > Cc: [email protected] [2.6.30+] > > Really? In the .32 kernel there is no function called: > > > --- a/net/socket.c > > +++ b/net/socket.c > > @@ -2588,23 +2588,123 @@ static int dev_ifconf(struct net *net, struct > > compat_ifconf __user *uifc32) > > > > static int ethtool_ioctl(struct net *net, struct compat_ifreq __user > > *ifr32) > > This isn't there at all that I can see. What am I missing?
This addition to 32-bit compat is still needed in 2.6.32, but it needs to be done in fs/compat_ioctl.c instead of net/socket.c. I'll send you a backport later. Ben. -- Ben Hutchings, Senior Software Engineer, Solarflare Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked. _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
