Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161033AbXBTWnG (ORCPT ); Tue, 20 Feb 2007 17:43:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161028AbXBTWnF (ORCPT ); Tue, 20 Feb 2007 17:43:05 -0500 Received: from e6.ny.us.ibm.com ([32.97.182.146]:33025 "EHLO e6.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161016AbXBTWnC (ORCPT ); Tue, 20 Feb 2007 17:43:02 -0500 Date: Tue, 20 Feb 2007 16:42:59 -0600 To: Jeff Garzik Cc: Benjamin Herrenschmidt , kou.ishizaki@toshiba.co.jp, arnd@arndb.de, Jens Osterkamp , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/12] spidernet: janitorial, typos Message-ID: <20070220224259.GK28895@austin.ibm.com> References: <20070220221314.GU923@austin.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070220221314.GU923@austin.ibm.com> User-Agent: Mutt/1.5.11 From: linas@austin.ibm.com (Linas Vepstas) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2613 Lines: 65 Janitorial patch. Undo long lines, fix typo in err msg. Signed-off-by: Linas Vepstas Cc: Jens Osterkamp Cc: Kou Ishizaki ---- drivers/net/spider_net.c | 13 +++++++------ drivers/net/spider_net.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) Index: linux-2.6.20-git16/drivers/net/spider_net.c =================================================================== --- linux-2.6.20-git16.orig/drivers/net/spider_net.c 2007-02-20 15:02:48.000000000 -0600 +++ linux-2.6.20-git16/drivers/net/spider_net.c 2007-02-20 15:02:50.000000000 -0600 @@ -1053,14 +1053,15 @@ static void show_rx_chain(struct spider_ #endif /** - * spider_net_decode_one_descr - processes an rx descriptor + * spider_net_decode_one_descr - processes an RX descriptor * @card: card structure * - * Returns 1 if a packet has been sent to the stack, otherwise 0 + * Returns 1 if a packet has been sent to the stack, otherwise 0. * - * Processes an rx descriptor by iommu-unmapping the data buffer and passing - * the packet up to the stack. This function is called in softirq - * context, e.g. either bottom half from interrupt or NAPI polling context + * Processes an RX descriptor by iommu-unmapping the data buffer + * and passing the packet up to the stack. This function is called + * in softirq context, e.g. either bottom half from interrupt or + * NAPI polling context. */ static int spider_net_decode_one_descr(struct spider_net_card *card) @@ -1097,7 +1098,7 @@ spider_net_decode_one_descr(struct spide if ( (status != SPIDER_NET_DESCR_COMPLETE) && (status != SPIDER_NET_DESCR_FRAME_END) ) { if (netif_msg_rx_err(card)) - pr_err("%s: RX descriptor with unkown state %d\n", + pr_err("%s: RX descriptor with unknown state %d\n", card->netdev->name, status); card->spider_stats.rx_desc_unk_state++; goto bad_desc; Index: linux-2.6.20-git16/drivers/net/spider_net.h =================================================================== --- linux-2.6.20-git16.orig/drivers/net/spider_net.h 2007-02-20 15:02:44.000000000 -0600 +++ linux-2.6.20-git16/drivers/net/spider_net.h 2007-02-20 15:02:50.000000000 -0600 @@ -25,7 +25,7 @@ #ifndef _SPIDER_NET_H #define _SPIDER_NET_H -#define VERSION "1.6 C" +#define VERSION "2.0 A" #include "sungem_phy.h" - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/