Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/spider_net.c

+7 −6
Original line number Diff line number Diff line
@@ -1053,14 +1053,15 @@ static void show_rx_chain(struct spider_net_card *card) 
#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 spider_net_card *card) 
	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;

drivers/net/spider_net.h

+1 −1
Original line number Diff line number Diff line
@@ -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"