aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/spider_net.c13
-rw-r--r--drivers/net/spider_net.h2
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 653a91adacc7..3b91af89e4c7 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1053,14 +1053,15 @@ static void show_rx_chain(struct spider_net_card *card)
1053#endif 1053#endif
1054 1054
1055/** 1055/**
1056 * spider_net_decode_one_descr - processes an rx descriptor 1056 * spider_net_decode_one_descr - processes an RX descriptor
1057 * @card: card structure 1057 * @card: card structure
1058 * 1058 *
1059 * Returns 1 if a packet has been sent to the stack, otherwise 0 1059 * Returns 1 if a packet has been sent to the stack, otherwise 0.
1060 * 1060 *
1061 * Processes an rx descriptor by iommu-unmapping the data buffer and passing 1061 * Processes an RX descriptor by iommu-unmapping the data buffer
1062 * the packet up to the stack. This function is called in softirq 1062 * and passing the packet up to the stack. This function is called
1063 * context, e.g. either bottom half from interrupt or NAPI polling context 1063 * in softirq context, e.g. either bottom half from interrupt or
1064 * NAPI polling context.
1064 */ 1065 */
1065static int 1066static int
1066spider_net_decode_one_descr(struct spider_net_card *card) 1067spider_net_decode_one_descr(struct spider_net_card *card)
@@ -1097,7 +1098,7 @@ spider_net_decode_one_descr(struct spider_net_card *card)
1097 if ( (status != SPIDER_NET_DESCR_COMPLETE) && 1098 if ( (status != SPIDER_NET_DESCR_COMPLETE) &&
1098 (status != SPIDER_NET_DESCR_FRAME_END) ) { 1099 (status != SPIDER_NET_DESCR_FRAME_END) ) {
1099 if (netif_msg_rx_err(card)) 1100 if (netif_msg_rx_err(card))
1100 pr_err("%s: RX descriptor with unkown state %d\n", 1101 pr_err("%s: RX descriptor with unknown state %d\n",
1101 card->netdev->name, status); 1102 card->netdev->name, status);
1102 card->spider_stats.rx_desc_unk_state++; 1103 card->spider_stats.rx_desc_unk_state++;
1103 goto bad_desc; 1104 goto bad_desc;
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index a1a42d5821b5..4a1e0d28a502 100644
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
@@ -25,7 +25,7 @@
25#ifndef _SPIDER_NET_H 25#ifndef _SPIDER_NET_H
26#define _SPIDER_NET_H 26#define _SPIDER_NET_H
27 27
28#define VERSION "1.6 C" 28#define VERSION "2.0 A"
29 29
30#include "sungem_phy.h" 30#include "sungem_phy.h"
31 31