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

Commit c5e631a8 authored by Frank Blaschka's avatar Frank Blaschka Committed by David S. Miller
Browse files

qeth: convert to hw_features part 2 



Set rx csum default to hw checksumming again.
Remove sysfs interface for rx csum (checksumming) and TSO (large_send).
With the new hw_features it does not work to keep the old sysfs
interface in parallel. Convert options.checksum_type to new hw_features.

Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32f5469b

drivers/s390/net/qeth_core.h

+0 −1
Original line number Diff line number Diff line
@@ -639,7 +639,6 @@ struct qeth_card_options { 
	struct qeth_ipa_info adp; /*Adapter parameters*/

	struct qeth_routing_info route6;

	struct qeth_ipa_info ipa6;

	enum qeth_checksum_types checksum_type;

	int broadcast_mode;

	int macaddr_mode;

	int fake_broadcast;

drivers/s390/net/qeth_core_main.c

+0 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,6 @@ static void qeth_set_intial_options(struct qeth_card *card) 
{

	card->options.route4.type = NO_ROUTER;

	card->options.route6.type = NO_ROUTER;

	card->options.checksum_type = QETH_CHECKSUM_DEFAULT;

	card->options.broadcast_mode = QETH_TR_BROADCAST_ALLRINGS;

	card->options.macaddr_mode = QETH_TR_MACADDR_NONCANONICAL;

	card->options.fake_broadcast = 0;

drivers/s390/net/qeth_core_mpc.h

+0 −8
Original line number Diff line number Diff line
@@ -80,14 +80,6 @@ enum qeth_tr_broadcast_modes { 
	QETH_TR_BROADCAST_LOCAL    = 1,

};



/* these values match CHECKSUM_* in include/linux/skbuff.h */

enum qeth_checksum_types {

	SW_CHECKSUMMING = 0, /* TODO: set to bit flag used in IPA Command */

	HW_CHECKSUMMING = 1,

	NO_CHECKSUMMING = 2,

};

#define QETH_CHECKSUM_DEFAULT SW_CHECKSUMMING



/*

 * Routing stuff

 */

drivers/s390/net/qeth_l2_main.c

+1 −4
Original line number Diff line number Diff line
@@ -420,9 +420,6 @@ static int qeth_l2_process_inbound_buffer(struct qeth_card *card, 
		case QETH_HEADER_TYPE_LAYER2:

			skb->pkt_type = PACKET_HOST;

			skb->protocol = eth_type_trans(skb, skb->dev);

			if (card->options.checksum_type == NO_CHECKSUMMING)

				skb->ip_summed = CHECKSUM_UNNECESSARY;

			else

			skb->ip_summed = CHECKSUM_NONE;

			if (skb->protocol == htons(ETH_P_802_2))

				*((__u32 *)skb->cb) = ++card->seqno.pkt_seqno;

drivers/s390/net/qeth_l3.h

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ void qeth_l3_del_vipa(struct qeth_card *, enum qeth_prot_versions, const u8 *); 
int qeth_l3_add_rxip(struct qeth_card *, enum qeth_prot_versions, const u8 *);

void qeth_l3_del_rxip(struct qeth_card *card, enum qeth_prot_versions,

			const u8 *);

int qeth_l3_set_large_send(struct qeth_card *, enum qeth_large_send_types);

int qeth_l3_set_rx_csum(struct qeth_card *, enum qeth_checksum_types);

int qeth_l3_is_addr_covered_by_ipato(struct qeth_card *, struct qeth_ipaddr *);



#endif /* __QETH_L3_H__ */