s390/qeth: add support for early L3 device setup
Similar to how qeth currently does early L2 setup of OSM and OSN devices, add support for early setup of L3-only devices. This adds a qeth_l3_devtype that contains all core and l3-specific sysfs attributes, so that they can be created in one go while probing. This just adds the infrastructure, exploitation of the support happens in a subsequent patch. Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com> Reviewed-by: Julian Wiedmann <jwi@linux.vnet.ibm.com> Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
cf536ffea9
commit
79a04e40f7
|
@ -65,6 +65,7 @@ struct qeth_ipato_entry {
|
|||
int mask_bits;
|
||||
};
|
||||
|
||||
extern const struct attribute_group *qeth_l3_attr_groups[];
|
||||
|
||||
void qeth_l3_ipaddr_to_string(enum qeth_prot_versions, const __u8 *, char *);
|
||||
int qeth_l3_string_to_ipaddr(const char *, enum qeth_prot_versions, __u8 *);
|
||||
|
|
|
@ -3005,14 +3005,21 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
|
|||
return register_netdev(card->dev);
|
||||
}
|
||||
|
||||
static const struct device_type qeth_l3_devtype = {
|
||||
.name = "qeth_layer3",
|
||||
.groups = qeth_l3_attr_groups,
|
||||
};
|
||||
|
||||
static int qeth_l3_probe_device(struct ccwgroup_device *gdev)
|
||||
{
|
||||
struct qeth_card *card = dev_get_drvdata(&gdev->dev);
|
||||
int rc;
|
||||
|
||||
rc = qeth_l3_create_device_attributes(&gdev->dev);
|
||||
if (rc)
|
||||
return rc;
|
||||
if (gdev->dev.type == &qeth_generic_devtype) {
|
||||
rc = qeth_l3_create_device_attributes(&gdev->dev);
|
||||
if (rc)
|
||||
return rc;
|
||||
}
|
||||
hash_init(card->ip_htable);
|
||||
hash_init(card->ip_mc_htable);
|
||||
card->options.layer2 = 0;
|
||||
|
@ -3024,7 +3031,8 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev)
|
|||
{
|
||||
struct qeth_card *card = dev_get_drvdata(&cgdev->dev);
|
||||
|
||||
qeth_l3_remove_device_attributes(&cgdev->dev);
|
||||
if (cgdev->dev.type == &qeth_generic_devtype)
|
||||
qeth_l3_remove_device_attributes(&cgdev->dev);
|
||||
|
||||
qeth_set_allowed_threads(card, 0, 1);
|
||||
wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);
|
||||
|
@ -3280,7 +3288,7 @@ static int qeth_l3_control_event(struct qeth_card *card,
|
|||
}
|
||||
|
||||
struct qeth_discipline qeth_l3_discipline = {
|
||||
.devtype = &qeth_generic_devtype,
|
||||
.devtype = &qeth_l3_devtype,
|
||||
.start_poll = qeth_qdio_start_poll,
|
||||
.input_handler = (qdio_handler_t *) qeth_qdio_input_handler,
|
||||
.output_handler = (qdio_handler_t *) qeth_qdio_output_handler,
|
||||
|
|
|
@ -1049,3 +1049,14 @@ void qeth_l3_remove_device_attributes(struct device *dev)
|
|||
sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group);
|
||||
sysfs_remove_group(&dev->kobj, &qeth_device_rxip_group);
|
||||
}
|
||||
|
||||
const struct attribute_group *qeth_l3_attr_groups[] = {
|
||||
&qeth_device_attr_group,
|
||||
&qeth_device_blkt_group,
|
||||
/* l3 specific, see l3_{create,remove}_device_attributes(): */
|
||||
&qeth_l3_device_attr_group,
|
||||
&qeth_device_ipato_group,
|
||||
&qeth_device_vipa_group,
|
||||
&qeth_device_rxip_group,
|
||||
NULL,
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue