Commit 50144f67 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: constify the disciplines 



The discipline struct is a fixed group of function pointers.
So declare the L2 and L3 disciplines as constant.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 949bbf4d

drivers/s390/net/qeth_core.h

+3 −3
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ struct qeth_card { 
	struct qeth_qdio_info qdio;

	int read_or_write_problem;

	struct qeth_osn_info osn_info;

	struct qeth_discipline *discipline;

	const struct qeth_discipline *discipline;

	atomic_t force_alloc_skb;

	struct service_level qeth_service_level;

	struct qdio_ssqd_desc ssqd;
@@ -1051,8 +1051,8 @@ static inline int qeth_send_simple_setassparms_v6(struct qeth_card *card, 


int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb);



extern struct qeth_discipline qeth_l2_discipline;

extern struct qeth_discipline qeth_l3_discipline;

extern const struct qeth_discipline qeth_l2_discipline;

extern const struct qeth_discipline qeth_l3_discipline;

extern const struct ethtool_ops qeth_ethtool_ops;

extern const struct ethtool_ops qeth_osn_ethtool_ops;

extern const struct attribute_group *qeth_generic_attr_groups[];

drivers/s390/net/qeth_l2_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2340,7 +2340,7 @@ static int qeth_l2_control_event(struct qeth_card *card, 
	}

}



struct qeth_discipline qeth_l2_discipline = {

const struct qeth_discipline qeth_l2_discipline = {

	.devtype = &qeth_l2_devtype,

	.setup = qeth_l2_probe_device,

	.remove = qeth_l2_remove_device,

drivers/s390/net/qeth_l3_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2073,7 +2073,7 @@ static int qeth_l3_control_event(struct qeth_card *card, 
	return 1;

}



struct qeth_discipline qeth_l3_discipline = {

const struct qeth_discipline qeth_l3_discipline = {

	.devtype = &qeth_l3_devtype,

	.setup = qeth_l3_probe_device,

	.remove = qeth_l3_remove_device,