s390: network driver.
Subsystems (3)
PATCH 4/10 s390: network driver.
[patch 4/10] s390: network driver.
From: Thomas Spatzier <[email protected]>
From: Peter Tiedemann <[email protected]>
network driver changes:
- qeth: return -EINVAL if an skb is too large.
- qeth: don't call netif_stop_queue after cable pull. Drop the packets instead.
- qeth: fix race between SET_IP and SET_MC kernel thread by removing SET_MC thread and let the SET_IP thread do multicast requests as well.
- qeth: make it compile without CONFIG_VLAN.
- ctc: avoid compiler warnings.
- lcs: write package sequence number to skb->cb.
diffstat:
drivers/s390/net/ctcmain.c | 22 ++- drivers/s390/net/lcs.c | 6 - drivers/s390/net/lcs.h | 3 drivers/s390/net/qeth.h | 8 - drivers/s390/net/qeth_main.c | 253 +++++++++++++++++++++---------------------- 5 files changed, 154 insertions(+), 138 deletions(-)
drivers/s390/net/ctcmain.c +15 -7
@@ -1,5 +1,5 @@/* -* $Id: ctcmain.c,v 1.63 2004/07/28 12:27:54 ptiedem Exp $ +* $Id: ctcmain.c,v 1.65 2004/10/27 09:12:48 mschwide Exp $ * * CTC / ESCON network driver *
@@ -36,7 +36,7 @@* along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* RELEASE-TAG: CTC/ESCON network driver $Revision: 1.63 $ +* RELEASE-TAG: CTC/ESCON network driver $Revision: 1.65 $ * */
@@ -320,7 +320,7 @@print_banner (void) {static int printed =0 ; -char vbuf[] ="$Revision: 1.63 $" ; +char vbuf[] ="$Revision: 1.65 $" ;char *version = vbuf;if (printed)
@@ -1224,7 +1224,9 @@fsm_deltimer (&ch->timer);fsm_addtimer (&ch->timer,CTC_TIMEOUT_5SEC ,CH_EVENT_TIMER , ch);fsm_newstate (fi,CH_STATE_SETUPWAIT ); -if (event ==CH_EVENT_TIMER ) + saveflags =0 ;/* avoids compiler warning with +spin_unlock_irqrestore */ +if (event ==CH_EVENT_TIMER )// only for timer not yet locked spin_lock_irqsave (get_ccwdev_lock (ch->cdev), saveflags); rc =ccw_device_start (ch->cdev, &ch->ccw[6 ], (unsigned long ) ch,0xff ,0 );if (event ==CH_EVENT_TIMER )
@@ -1335,7 +1337,9 @@DBF_TEXT (trace,3 , __FUNCTION__);fsm_deltimer (&ch->timer);fsm_addtimer (&ch->timer,CTC_TIMEOUT_5SEC ,CH_EVENT_TIMER , ch); -if (event ==CH_EVENT_STOP ) + saveflags =0 ;/* avoids comp warning with +spin_unlock_irqrestore */ +if (event ==CH_EVENT_STOP )// only for STOP not yet locked spin_lock_irqsave (get_ccwdev_lock (ch->cdev), saveflags); oldstate =fsm_getstate (fi);fsm_newstate (fi,CH_STATE_TERM );
@@ -1508,7 +1512,9 @@fsm_addtimer (&ch->timer,CTC_TIMEOUT_5SEC ,CH_EVENT_TIMER , ch); oldstate =fsm_getstate (fi);fsm_newstate (fi,CH_STATE_STARTWAIT ); -if (event ==CH_EVENT_TIMER ) + saveflags =0 ;/* avoids compiler warning with +spin_unlock_irqrestore */ +if (event ==CH_EVENT_TIMER )// only for timer not yet locked spin_lock_irqsave (get_ccwdev_lock (ch->cdev), saveflags); rc =ccw_device_halt (ch->cdev, (unsigned long ) ch);if (event ==CH_EVENT_TIMER )
@@ -1674,7 +1680,9 @@return ; }fsm_addtimer (&ch->timer,1000 ,CH_EVENT_TIMER , ch); -if (event ==CH_EVENT_TIMER ) + saveflags =0 ;/* avoids compiler warning with +spin_unlock_irqrestore */ +if (event ==CH_EVENT_TIMER )// only for TIMER not yet locked spin_lock_irqsave (get_ccwdev_lock (ch->cdev), saveflags); rc = ccw_device_start(ch->cdev, &ch->ccw[3],
drivers/s390/net/lcs.c +4 -2
@@ -11,7 +11,7 @@* Frank Pavlic ([email protected]) and * Martin Schwidefsky <[email protected]> * -* $Revision: 1.94 $ $Date: 2004/10/19 09:30:54 $ +* $Revision: 1.96 $ $Date: 2004/11/11 13:42:33 $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
@@ -59,7 +59,7 @@/** * initialization string for output */ -#define VERSION_LCS_C "$Revision: 1.94 $" +#define VERSION_LCS_C "$Revision: 1.96 $"static char version[]__initdata ="LCS driver (" VERSION_LCS_C "/" VERSION_LCS_H ")" ;static char debug_buffer[255 ];
@@ -191,6 +191,7 @@return NULL ;memset (card,0 ,sizeof (struct lcs_card )); card->lan_type =LCS_FRAME_TYPE_AUTO ; + card->pkt_seq =0 ; card->lancmd_timeout =LCS_LANCMD_TIMEOUT_DEFAULT ;/* Allocate io buffers for the read channel. */ rc =lcs_alloc_channel (&card->read);
@@ -1874,6 +1875,7 @@ skb->protocol = card->lan_type_trans (skb, card->dev); card->stats.rx_bytes += skb_len; card->stats.rx_packets++; + *((__u32 *)skb->cb) = ++card->pkt_seq;netif_rx (skb); }
drivers/s390/net/lcs.h +2 -1
@@ -6,7 +6,7 @@#include <linux/workqueue.h> #include <asm/ccwdev.h> -#define VERSION_LCS_H "$Revision: 1.18 $" +#define VERSION_LCS_H "$Revision: 1.19 $"#define LCS_DBF_TEXT (level, name, text) \ do { \
@@ -309,6 +309,7 @@__u16 ip_assists_supported;__u16 ip_assists_enabled;__s8 lan_type; +__u32 pkt_seq;__u16 sequence_no;__s16 portno;/* Some info copied from probeinfo */
drivers/s390/net/qeth.h +4 -4
@@ -24,7 +24,7 @@#include "qeth_mpc.h" -#define VERSION_QETH_H "$Revision: 1.116 $" +#define VERSION_QETH_H "$Revision: 1.123 $"#ifdef CONFIG_QETH_IPV6 #define QETH_VERSION_IPV6 ":IPv6"
@@ -557,6 +557,7 @@QETH_IP_TYPE_NORMAL ,QETH_IP_TYPE_VIPA ,QETH_IP_TYPE_RXIP , + QETH_IP_TYPE_DEL_ALL_MC, }; enum qeth_cmd_buffer_state {
@@ -713,8 +714,7 @@*/ enum qeth_threads {QETH_SET_IP_THREAD =1 , -QETH_SET_MC_THREAD =2 , -QETH_RECOVER_THREAD =4 , +QETH_RECOVER_THREAD =2 , };struct qeth_card {
@@ -748,7 +748,7 @@volatile unsigned long thread_running_mask;spinlock_t ip_lock;struct list_head ip_list; -struct list_head ip_tbd_list; +struct list_head *ip_tbd_list;struct qeth_ipato ipato;struct list_head cmd_waiter_list;/* QDIO buffer handling */
drivers/s390/net/qeth_main.c +129 -124
470 lines not on this page · raw message
Quoted 9 lines · Martin Schwidefsky
[patch 4/10] s390: network driver.
From: Thomas Spatzier <[email protected]>
From: Peter Tiedemann <[email protected]>network driver changes:
- qeth: return-EINVALif an skb is too large.
- qeth: don't callnetif_stop_queueafter cable pull. Drop the packets instead.
You should be using netif_carrier_{on,off} properly, and not drop the packets. When (if) link comes back, you requeue the packets to hardware (or hypervisor or whatever). Your dev->stop() should stop operation and clean up anything left in your send/receive {rings | buffers}.
Jeff