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

Commit ecf7f354 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream

parents c233289c 8b98a37c

drivers/s390/net/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -92,15 +92,6 @@ config QETH_VLAN 
	  If CONFIG_QETH is switched on, this option will include IEEE

	  802.1q VLAN support in the qeth device driver.



config QETH_PERF_STATS

	bool "Performance statistics in /proc"

	depends on QETH

	help

	  When switched on, this option will add a file in the proc-fs

	  (/proc/qeth_perf_stats) containing performance statistics. It

	  may slightly impact performance, so this is only recommended for

	  internal tuning of the device driver.



config CCWGROUP

 	tristate

	default (LCS || CTC || QETH)

drivers/s390/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ obj-$(CONFIG_SMSGIUCV) += smsgiucv.o 
obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o

obj-$(CONFIG_LCS) += lcs.o cu3088.o

obj-$(CONFIG_CLAW) += claw.o cu3088.o

obj-$(CONFIG_MPC) += ctcmpc.o fsm.o cu3088.o

qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o 

qeth-$(CONFIG_PROC_FS) += qeth_proc.o

obj-$(CONFIG_QETH) += qeth.o

drivers/s390/net/ctcmain.c

+3 −0
Original line number Diff line number Diff line
@@ -1714,6 +1714,9 @@ add_channel(struct ccw_device *cdev, enum channel_types type) 
		kfree(ch);

		return 0;

	}



	spin_lock_init(&ch->collect_lock);



	fsm_settimer(ch->fsm, &ch->timer);

	skb_queue_head_init(&ch->io_queue);

	skb_queue_head_init(&ch->collect_queue);

drivers/s390/net/iucv.c

+2 −2
Original line number Diff line number Diff line
@@ -335,8 +335,8 @@ do { \ 


#else



#define iucv_debug(lvl, fmt, args...)

#define iucv_dumpit(title, buf, len)

#define iucv_debug(lvl, fmt, args...)	do { } while (0)

#define iucv_dumpit(title, buf, len)	do { } while (0)



#endif

drivers/s390/net/lcs.c

+5 −8
Original line number Diff line number Diff line
@@ -670,9 +670,8 @@ lcs_ready_buffer(struct lcs_channel *channel, struct lcs_buffer *buffer) 
	int index, rc;



	LCS_DBF_TEXT(5, trace, "rdybuff");

	if (buffer->state != BUF_STATE_LOCKED &&

	    buffer->state != BUF_STATE_PROCESSED)

		BUG();

	BUG_ON(buffer->state != BUF_STATE_LOCKED &&

	       buffer->state != BUF_STATE_PROCESSED);

	spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);

	buffer->state = BUF_STATE_READY;

	index = buffer - channel->iob;
@@ -696,8 +695,7 @@ __lcs_processed_buffer(struct lcs_channel *channel, struct lcs_buffer *buffer) 
	int index, prev, next;



	LCS_DBF_TEXT(5, trace, "prcsbuff");

	if (buffer->state != BUF_STATE_READY)

		BUG();

	BUG_ON(buffer->state != BUF_STATE_READY);

	buffer->state = BUF_STATE_PROCESSED;

	index = buffer - channel->iob;

	prev = (index - 1) & (LCS_NUM_BUFFS - 1);
@@ -729,9 +727,8 @@ lcs_release_buffer(struct lcs_channel *channel, struct lcs_buffer *buffer) 
	unsigned long flags;



	LCS_DBF_TEXT(5, trace, "relbuff");

	if (buffer->state != BUF_STATE_LOCKED &&

	    buffer->state != BUF_STATE_PROCESSED)

		BUG();

	BUG_ON(buffer->state != BUF_STATE_LOCKED &&

	       buffer->state != BUF_STATE_PROCESSED);

	spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);

	buffer->state = BUF_STATE_EMPTY;

	spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);