Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[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: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
authored by Jean Tourrilhes and committed by Jeff Garzik aca0b510 e7f52e4c
+4
-12
drivers/net/wireless/wavelan_cs.c
+4
-12
drivers/net/wireless/wavelan_cs.c
···
950
950
static inline int
951
951
wv_diag(struct net_device * dev)
952
952
{
953
-
int ret = FALSE;
954
-
955
-
if(wv_82593_cmd(dev, "wv_diag(): diagnose",
956
-
OP0_DIAGNOSE, SR0_DIAGNOSE_PASSED))
957
-
ret = TRUE;
958
-
959
-
#ifdef DEBUG_CONFIG_ERRORS
960
-
printk(KERN_INFO "wavelan_cs: i82593 Self Test failed!\n");
961
-
#endif
962
-
return(ret);
953
+
return(wv_82593_cmd(dev, "wv_diag(): diagnose",
954
+
OP0_DIAGNOSE, SR0_DIAGNOSE_PASSED));
963
955
} /* wv_diag */
964
956
965
957
/*------------------------------------------------------------------*/
···
3596
3604
cfblk.lin_prio = 0; /* conform to 802.3 backoff algoritm */
3597
3605
cfblk.exp_prio = 5; /* conform to 802.3 backoff algoritm */
3598
3606
cfblk.bof_met = 1; /* conform to 802.3 backoff algoritm */
3599
-
cfblk.ifrm_spc = 0x20; /* 32 bit times interframe spacing */
3600
-
cfblk.slottim_low = 0x20; /* 32 bit times slot time */
3607
+
cfblk.ifrm_spc = 0x20 >> 4; /* 32 bit times interframe spacing */
3608
+
cfblk.slottim_low = 0x20 >> 5; /* 32 bit times slot time */
3601
3609
cfblk.slottim_hi = 0x0;
3602
3610
cfblk.max_retr = 15;
3603
3611
cfblk.prmisc = ((lp->promiscuous) ? TRUE: FALSE); /* Promiscuous mode */