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

Commit 2aedd56a authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: use and remove some defines 



1. a buffer has 16 is_header flags, because that's its # of elements
2. replace the last occurrence of QETH_HEADER_SIZE, and remove it

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Acked-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e38db6be

drivers/s390/net/qeth_core.h

+1 −2
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ static inline int qeth_is_ipa_enabled(struct qeth_ipa_info *ipa, 
#define QETH_TX_TIMEOUT		100 * HZ

#define QETH_RCD_TIMEOUT	60 * HZ

#define QETH_RECLAIM_WORK_TIME	HZ

#define QETH_HEADER_SIZE	32

#define QETH_MAX_PORTNO		15



/*IPv6 address autoconfiguration stuff*/
@@ -447,7 +446,7 @@ struct qeth_qdio_out_buffer { 
	atomic_t state;

	int next_element_to_fill;

	struct sk_buff_head skb_list;

	int is_header[16];

	int is_header[QDIO_MAX_ELEMENTS_PER_BUFFER];



	struct qaob *aob;

	struct qeth_qdio_out_q *q;

drivers/s390/net/qeth_l2_main.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static void qeth_l2_fill_header(struct qeth_card *card, struct qeth_hdr *hdr, 
	else

		hdr->hdr.l2.flags[2] |= QETH_LAYER2_FLAG_UNICAST;



	hdr->hdr.l2.pkt_length = skb->len-QETH_HEADER_SIZE;

	hdr->hdr.l2.pkt_length = skb->len - sizeof(struct qeth_hdr);

	/* VSWITCH relies on the VLAN

	 * information to be present in

	 * the QDIO header */