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

Commit aca0b510 authored by Jean Tourrilhes's avatar Jean Tourrilhes Committed by Jeff Garzik
Browse files

[PATCH] Wavelan_cs bitfield fixes 



	Some bitfields were incorrectly initialised in wavelan_cs,
causing some compiler warning. Also killed a error message that should
not be there...

Signed-off-by: default avatarJean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent e7f52e4c

drivers/net/wireless/wavelan_cs.c

+4 −12
Original line number Diff line number Diff line
@@ -950,16 +950,8 @@ wv_82593_cmd(struct net_device * dev, 
static inline int

wv_diag(struct net_device *	dev)

{

  int		ret = FALSE;



  if(wv_82593_cmd(dev, "wv_diag(): diagnose",

		  OP0_DIAGNOSE, SR0_DIAGNOSE_PASSED))

    ret = TRUE;



#ifdef DEBUG_CONFIG_ERRORS

  printk(KERN_INFO "wavelan_cs: i82593 Self Test failed!\n");

#endif

  return(ret);

  return(wv_82593_cmd(dev, "wv_diag(): diagnose",

		      OP0_DIAGNOSE, SR0_DIAGNOSE_PASSED));

} /* wv_diag */



/*------------------------------------------------------------------*/
@@ -3604,8 +3596,8 @@ wv_82593_config(struct net_device * dev) 
  cfblk.lin_prio = 0;   	/* conform to 802.3 backoff algoritm */

  cfblk.exp_prio = 5;	        /* conform to 802.3 backoff algoritm */

  cfblk.bof_met = 1;	        /* conform to 802.3 backoff algoritm */

  cfblk.ifrm_spc = 0x20;	/* 32 bit times interframe spacing */

  cfblk.slottim_low = 0x20;	/* 32 bit times slot time */

  cfblk.ifrm_spc = 0x20 >> 4;	/* 32 bit times interframe spacing */

  cfblk.slottim_low = 0x20 >> 5;	/* 32 bit times slot time */

  cfblk.slottim_hi = 0x0;

  cfblk.max_retr = 15;

  cfblk.prmisc = ((lp->promiscuous) ? TRUE: FALSE);	/* Promiscuous mode */