From patchwork Sat Dec 11 06:20:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 75189 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 506FEB6F1E for ; Sat, 11 Dec 2010 17:20:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752074Ab0LKGUo (ORCPT ); Sat, 11 Dec 2010 01:20:44 -0500 Received: from qmta10.emeryville.ca.mail.comcast.net ([76.96.30.17]:57526 "EHLO qmta10.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751682Ab0LKGUn (ORCPT ); Sat, 11 Dec 2010 01:20:43 -0500 Received: from omta14.emeryville.ca.mail.comcast.net ([76.96.30.60]) by qmta10.emeryville.ca.mail.comcast.net with comcast id hi2m1f0011HpZEsAAiLj9S; Sat, 11 Dec 2010 06:20:43 +0000 Received: from localhost.localdomain ([76.27.217.242]) by omta14.emeryville.ca.mail.comcast.net with comcast id hiLi1f0035ENa2s8aiLik3; Sat, 11 Dec 2010 06:20:43 +0000 From: Jeff Kirsher To: davem@davemloft.net Cc: Bruce Allan , netdev@vger.kernel.org, gospo@redhat.com, bphilips@novell.com, Jeff Kirsher Subject: [PATCH 24/27] e1000e: minor error message corrections Date: Fri, 10 Dec 2010 22:20:37 -0800 Message-Id: <1292048440-22125-1-git-send-email-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 1.7.3.2 To: davem@davemloft.net Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Bruce Allan Correct error messages when setting up Rx resources and when checking module parameters. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher --- drivers/net/e1000e/netdev.c | 2 +- drivers/net/e1000e/param.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 4bf843a..6e1f3a3 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -2130,7 +2130,7 @@ err_pages: } err: vfree(rx_ring->buffer_info); - e_err("Unable to allocate memory for the transmit descriptor ring\n"); + e_err("Unable to allocate memory for the receive descriptor ring\n"); return err; } diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c index 3d36911..a9612b0 100644 --- a/drivers/net/e1000e/param.c +++ b/drivers/net/e1000e/param.c @@ -421,7 +421,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter) static const struct e1000_option opt = { .type = enable_option, .name = "CRC Stripping", - .err = "defaulting to enabled", + .err = "defaulting to Enabled", .def = OPTION_ENABLED };