Re: [RTnet-users] [PATCH] e1000 parameters are read incorrectly

[Jan Kiszka]

Frederik Bayart wrote:
> Jan,
> 
> Below the git patch as requested.
> 
> Frederik
> 
> 
> From 0f1f4a6976edeb7c30749a96e9b51172d897a12b Mon Sep 17 00:00:00 2001
> From: Frederik Bayart <frederik.bay...@triphase.com>
> Date: Wed, 1 Apr 2009 10:10:18 +0200
> Subject: [PATCH] fix incorrect reading of input params : if in rtnet.conf
> RT_DRIVER_OPTIONS="cards=0,1,0 and RxIntDelay=0,1,2",  the parameter will be
> initialized with 2 instead of 1 for the 2nd card.
>  Signed-off-by: Frederik Bayart <frederik.bay...@triphase.com>
> 
> ---
>  drivers/e1000/e1000_main.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/e1000/e1000_main.c b/drivers/e1000/e1000_main.c
> index 27c85c3..7c2747e 100644
> --- a/drivers/e1000/e1000_main.c
> +++ b/drivers/e1000/e1000_main.c
> @@ -779,7 +779,7 @@ e1000_probe(struct pci_dev *pdev,
>       netdev->mem_end = mmio_start + mmio_len;
>       netdev->base_addr = adapter->hw.io_base;
>  
> -     adapter->bd_number = cards_found;
> +     adapter->bd_number = cards_found+1;
>  
>       /* setup the private structure */
>  

Almost :). I applied now this patch:


rt_e1000: Fix incorrect reading of input params
    
RT_DRIVER_OPTIONS="cards=0,1,0 and RxIntDelay=0,1,2", the parameter will
be initialized with 2 instead of 1 for the 2nd card.
    
Signed-off-by: Frederik Bayart <frederik.bay...@triphase.com>
Signed-off-by: Jan Kiszka <jan.kis...@web.de>

diff --git a/drivers/e1000/e1000_main.c b/drivers/e1000/e1000_main.c
index 27c85c3..12a8ef3 100644
--- a/drivers/e1000/e1000_main.c
+++ b/drivers/e1000/e1000_main.c
@@ -779,7 +779,7 @@ e1000_probe(struct pci_dev *pdev,
        netdev->mem_end = mmio_start + mmio_len;
        netdev->base_addr = adapter->hw.io_base;
 
-       adapter->bd_number = cards_found;
+       adapter->bd_number = cards_found - 1;
 
        /* setup the private structure */
 

Thanks,
Jan

signature.asc
Description: OpenPGP digital signature

------------------------------------------------------------------------------

_______________________________________________
RTnet-users mailing list
RTnet-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rtnet-users