Commit 70553da9 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] s390: qeth network driver

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Frank Pavlic <pavlic@de.ibm.com>
From: Thomas Spatzier <tspat@de.ibm.com>

qeth network driver changes:
 - Use correct request length in arp/snmp requests.
 - Simplify handling of empty vs. primed buffers.
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 55de14a7
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "qeth_mpc.h" #include "qeth_mpc.h"
#define VERSION_QETH_H "$Revision: 1.109 $" #define VERSION_QETH_H "$Revision: 1.110 $"
#ifdef CONFIG_QETH_IPV6 #ifdef CONFIG_QETH_IPV6
#define QETH_VERSION_IPV6 ":IPv6" #define QETH_VERSION_IPV6 ":IPv6"
...@@ -380,11 +380,6 @@ enum qeth_qdio_buffer_states { ...@@ -380,11 +380,6 @@ enum qeth_qdio_buffer_states {
* outbound: filled by driver; owned by hardware in order to be sent * outbound: filled by driver; owned by hardware in order to be sent
*/ */
QETH_QDIO_BUF_PRIMED, QETH_QDIO_BUF_PRIMED,
/*
* inbound only: an error condition has been detected for a buffer
* the buffer will be discarded (not read out)
*/
QETH_QDIO_BUF_ERROR,
}; };
enum qeth_qdio_info_states { enum qeth_qdio_info_states {
...@@ -423,7 +418,7 @@ struct qeth_qdio_q { ...@@ -423,7 +418,7 @@ struct qeth_qdio_q {
struct qeth_qdio_out_buffer { struct qeth_qdio_out_buffer {
struct qdio_buffer *buffer; struct qdio_buffer *buffer;
volatile enum qeth_qdio_buffer_states state; atomic_t state;
volatile int next_element_to_fill; volatile int next_element_to_fill;
struct sk_buff_head skb_list; struct sk_buff_head skb_list;
}; };
......
This diff is collapsed.
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