Commit 7376e732 authored by Linas Vepstas's avatar Linas Vepstas Committed by Jeff Garzik

spidernet: janitorial, typos

Janitorial patch. Undo long lines, fix typo in err msg.
Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Cc: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
Cc: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 5c8e98fe
...@@ -1053,14 +1053,15 @@ static void show_rx_chain(struct spider_net_card *card) ...@@ -1053,14 +1053,15 @@ static void show_rx_chain(struct spider_net_card *card)
#endif #endif
/** /**
* spider_net_decode_one_descr - processes an rx descriptor * spider_net_decode_one_descr - processes an RX descriptor
* @card: card structure * @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 * Processes an RX descriptor by iommu-unmapping the data buffer
* the packet up to the stack. This function is called in softirq * and passing the packet up to the stack. This function is called
* context, e.g. either bottom half from interrupt or NAPI polling context * in softirq context, e.g. either bottom half from interrupt or
* NAPI polling context.
*/ */
static int static int
spider_net_decode_one_descr(struct spider_net_card *card) spider_net_decode_one_descr(struct spider_net_card *card)
...@@ -1097,7 +1098,7 @@ spider_net_decode_one_descr(struct spider_net_card *card) ...@@ -1097,7 +1098,7 @@ spider_net_decode_one_descr(struct spider_net_card *card)
if ( (status != SPIDER_NET_DESCR_COMPLETE) && if ( (status != SPIDER_NET_DESCR_COMPLETE) &&
(status != SPIDER_NET_DESCR_FRAME_END) ) { (status != SPIDER_NET_DESCR_FRAME_END) ) {
if (netif_msg_rx_err(card)) 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->netdev->name, status);
card->spider_stats.rx_desc_unk_state++; card->spider_stats.rx_desc_unk_state++;
goto bad_desc; goto bad_desc;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#ifndef _SPIDER_NET_H #ifndef _SPIDER_NET_H
#define _SPIDER_NET_H #define _SPIDER_NET_H
#define VERSION "1.6 C" #define VERSION "2.0 A"
#include "sungem_phy.h" #include "sungem_phy.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment