From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751030AbWGQQiS (ORCPT ); Mon, 17 Jul 2006 12:38:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751006AbWGQQdm (ORCPT ); Mon, 17 Jul 2006 12:33:42 -0400 Received: from mail.kroah.org ([69.55.234.183]:64443 "EHLO perch.kroah.org") by vger.kernel.org with ESMTP id S1750974AbWGQQdL (ORCPT ); Mon, 17 Jul 2006 12:33:11 -0400 Date: Mon, 17 Jul 2006 09:26:45 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org, marcelo@kvack.org, davem@davemloft.net Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, matthew@wil.cx, Willy Tarreau , Jeff Garzik , Chris Wright , Greg Kroah-Hartman Subject: [patch 12/45] 2 oopses in ethtool Message-ID: <20060717162645.GM4829@kroah.com> References: <20060717160652.408007000@blue.kroah.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="2-oopses-in-ethtool.patch" In-Reply-To: <20060717162452.GA4829@kroah.com> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org -stable review patch. If anyone has any objections, please let us know. ------------------ From: Willy Tarreau The function pointers which were checked were for their get_* counterparts. Typically a copy-paste typo. Signed-off-by: Willy Tarreau Acked-by: Jeff Garzik Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- net/core/ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.17.3.orig/net/core/ethtool.c +++ linux-2.6.17.3/net/core/ethtool.c @@ -437,7 +437,7 @@ static int ethtool_set_pauseparam(struct { struct ethtool_pauseparam pauseparam; - if (!dev->ethtool_ops->get_pauseparam) + if (!dev->ethtool_ops->set_pauseparam) return -EOPNOTSUPP; if (copy_from_user(&pauseparam, useraddr, sizeof(pauseparam))) --