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

Commit bab76198 authored by Jouni Malinen's avatar Jouni Malinen Committed by Jeff Garzik
Browse files

[PATCH] hostap: Remove hw specific dev_open/close handlers 



Host AP driver used hardware model specific dev_open/close handlers
that were called on dev_open/close if the hardware driver had
registered the handler. These were only used for hostap_cs and only
for tracking whether any of the netdevs were UP. This information is
already available from local->num_dev_open, so there is not need for
the special open/close handler.

Let's get rid of these handlers. In addition to cleaning up the code,
this fixes a module refcounting issue for hostap_cs where ejecting the
card while any of the netdevs were open did not decrement refcount
properly.

Signed-off-by: default avatarJouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 2759c8d5

drivers/net/wireless/hostap/hostap.c

+0 −6
Original line number Diff line number Diff line
@@ -716,9 +716,6 @@ static int prism2_close(struct net_device *dev) 
		hostap_deauth_all_stas(dev, local->ap, 1);

#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */



	if (local->func->dev_close && local->func->dev_close(local))

		return 0;



	if (dev == local->dev) {

		local->func->hw_shutdown(dev, HOSTAP_HW_ENABLE_CMDCOMPL);

	}
@@ -766,9 +763,6 @@ static int prism2_open(struct net_device *dev) 
	    local->hw_downloading)

		return -ENODEV;



	if (local->func->dev_open && local->func->dev_open(local))

		return 1;



	if (!try_module_get(local->hw_module))

		return -ENODEV;

	local->num_dev_open++;

drivers/net/wireless/hostap/hostap_cs.c

+10 −35
Original line number Diff line number Diff line
@@ -492,42 +492,10 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr) 
}





static int prism2_pccard_dev_open(local_info_t *local)

{

	struct hostap_cs_priv *hw_priv = local->hw_priv;

	hw_priv->link->open++;

	return 0;

}





static int prism2_pccard_dev_close(local_info_t *local)

{

	struct hostap_cs_priv *hw_priv;



	if (local == NULL || local->hw_priv == NULL)

		return 1;

	hw_priv = local->hw_priv;

	if (hw_priv->link == NULL)

		return 1;



	if (!hw_priv->link->open) {

		printk(KERN_WARNING "%s: prism2_pccard_dev_close(): "

		       "link not open?!\n", local->dev->name);

		return 1;

	}



	hw_priv->link->open--;



	return 0;

}





static struct prism2_helper_functions prism2_pccard_funcs =

{

	.card_present	= prism2_pccard_card_present,

	.cor_sreset	= prism2_pccard_cor_sreset,

	.dev_open	= prism2_pccard_dev_open,

	.dev_close	= prism2_pccard_dev_close,

	.genesis_reset	= prism2_pccard_genesis_reset,

	.hw_type	= HOSTAP_HW_PCCARD,

};
@@ -883,6 +851,13 @@ static int prism2_event(event_t event, int priority, 
{

	dev_link_t *link = args->client_data;

	struct net_device *dev = (struct net_device *) link->priv;

	int dev_open = 0;



	if (link->state & DEV_CONFIG) {

		struct hostap_interface *iface = netdev_priv(dev);

		if (iface && iface->local)

			dev_open = iface->local->num_dev_open > 0;

	}



	switch (event) {

	case CS_EVENT_CARD_INSERTION:
@@ -911,7 +886,7 @@ static int prism2_event(event_t event, int priority, 
	case CS_EVENT_RESET_PHYSICAL:

		PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_RESET_PHYSICAL\n", dev_info);

		if (link->state & DEV_CONFIG) {

			if (link->open) {

			if (dev_open) {

				netif_stop_queue(dev);

				netif_device_detach(dev);

			}
@@ -931,8 +906,8 @@ static int prism2_event(event_t event, int priority, 
			pcmcia_request_configuration(link->handle,

						     &link->conf);

			prism2_hw_shutdown(dev, 1);

			prism2_hw_config(dev, link->open ? 0 : 1);

			if (link->open) {

			prism2_hw_config(dev, dev_open ? 0 : 1);

			if (dev_open) {

				netif_device_attach(dev);

				netif_start_queue(dev);

			}

drivers/net/wireless/hostap/hostap_pci.c

+0 −2
Original line number Diff line number Diff line
@@ -277,8 +277,6 @@ static struct prism2_helper_functions prism2_pci_funcs = 
{

	.card_present	= NULL,

	.cor_sreset	= prism2_pci_cor_sreset,

	.dev_open	= NULL,

	.dev_close	= NULL,

	.genesis_reset	= prism2_pci_genesis_reset,

	.hw_type	= HOSTAP_HW_PCI,

};

drivers/net/wireless/hostap/hostap_plx.c

+0 −2
Original line number Diff line number Diff line
@@ -328,8 +328,6 @@ static struct prism2_helper_functions prism2_plx_funcs = 
{

	.card_present	= NULL,

	.cor_sreset	= prism2_plx_cor_sreset,

	.dev_open	= NULL,

	.dev_close	= NULL,

	.genesis_reset	= prism2_plx_genesis_reset,

	.hw_type	= HOSTAP_HW_PLX,

};

drivers/net/wireless/hostap/hostap_wlan.h

+0 −2
Original line number Diff line number Diff line
@@ -552,8 +552,6 @@ struct prism2_helper_functions { 
	 * (hostap_{cs,plx,pci}.c */

	int (*card_present)(local_info_t *local);

	void (*cor_sreset)(local_info_t *local);

	int (*dev_open)(local_info_t *local);

	int (*dev_close)(local_info_t *local);

	void (*genesis_reset)(local_info_t *local, int hcr);



	/* the following functions are from hostap_hw.c, but they may have some