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

Commit 42a51b93 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

orinoco: Move FID allocation to hw.c 



This is part of refactorring the initialisation code so that we can
load the firmware before registerring with netdev.

Signed-off-by: default avatarDavid Kilroy <kilroyd@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e9e3d010

drivers/net/wireless/orinoco/hw.c

+23 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 


#define SYMBOL_MAX_VER_LEN	(14)



/* Symbol firmware has a bug allocating buffers larger than this */

#define TX_NICBUF_SIZE_BUG	1585



/********************************************************************/

/* Data tables                                                      */

/********************************************************************/
@@ -364,6 +367,26 @@ int orinoco_hw_read_card_settings(struct orinoco_private *priv, u8 *dev_addr) 
	return err;

}



int orinoco_hw_allocate_fid(struct orinoco_private *priv)

{

	struct net_device *dev = priv->ndev;

	struct hermes *hw = &priv->hw;

	int err;



	err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);

	if (err == -EIO && priv->nicbuf_size > TX_NICBUF_SIZE_BUG) {

		/* Try workaround for old Symbol firmware bug */

		priv->nicbuf_size = TX_NICBUF_SIZE_BUG;

		err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);



		printk(KERN_WARNING "%s: firmware ALLOC bug detected "

		       "(old Symbol firmware?). Work around %s\n",

		       dev->name, err ? "failed!" : "ok.");

	}



	return err;

}



int orinoco_get_bitratemode(int bitrate, int automatic)

{

	int ratemode = -1;

drivers/net/wireless/orinoco/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ struct dev_addr_list; 


int determine_fw_capabilities(struct orinoco_private *priv);

int orinoco_hw_read_card_settings(struct orinoco_private *priv, u8 *dev_addr);

int orinoco_hw_allocate_fid(struct orinoco_private *priv);

int orinoco_get_bitratemode(int bitrate, int automatic);

void orinoco_get_ratemode_cfg(int ratemode, int *bitrate, int *automatic);

drivers/net/wireless/orinoco/main.c

+2 −23
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ static const u8 encaps_hdr[] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00}; 
					    * how many events the

					    * device could

					    * legitimately generate */

#define TX_NICBUF_SIZE_BUG	1585		/* Bug in Symbol firmware */



#define DUMMY_FID		0xFFFF
@@ -1574,26 +1573,6 @@ int __orinoco_down(struct net_device *dev) 
}

EXPORT_SYMBOL(__orinoco_down);



static int orinoco_allocate_fid(struct net_device *dev)

{

	struct orinoco_private *priv = netdev_priv(dev);

	struct hermes *hw = &priv->hw;

	int err;



	err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);

	if (err == -EIO && priv->nicbuf_size > TX_NICBUF_SIZE_BUG) {

		/* Try workaround for old Symbol firmware bug */

		priv->nicbuf_size = TX_NICBUF_SIZE_BUG;

		err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);



		printk(KERN_WARNING "%s: firmware ALLOC bug detected "

		       "(old Symbol firmware?). Work around %s\n",

		       dev->name, err ? "failed!" : "ok.");

	}



	return err;

}



int orinoco_reinit_firmware(struct net_device *dev)

{

	struct orinoco_private *priv = netdev_priv(dev);
@@ -1607,7 +1586,7 @@ int orinoco_reinit_firmware(struct net_device *dev) 
			priv->do_fw_download = 0;

	}

	if (!err)

		err = orinoco_allocate_fid(dev);

		err = orinoco_hw_allocate_fid(priv);



	return err;

}
@@ -2167,7 +2146,7 @@ static int orinoco_init(struct net_device *dev) 
	if (err)

		goto out;



	err = orinoco_allocate_fid(dev);

	err = orinoco_hw_allocate_fid(priv);

	if (err) {

		printk(KERN_ERR "%s: failed to allocate NIC buffer!\n",

		       dev->name);