Skip to content

Commit

Permalink
staging: ft1000: Always extract device number from netdev name.
Browse files Browse the repository at this point in the history
Using gCardIndex as global variable was not correctly used because
for every plugged device was set to 0 in init_ft1000_netdev.

Remove global definition. Use it locally and for every plugged
device extract number from net device name.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Marek Belisko authored and Greg Kroah-Hartman committed Dec 13, 2010
1 parent 983bbfd commit 448d401
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ static int ft1000_chkcard (struct ft1000_device *dev);
//Jim

static u8 tempbuffer[1600];
static unsigned long gCardIndex;

#define MAX_RCV_LOOP 100

Expand Down Expand Up @@ -773,8 +772,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
int i, ret_val;
struct list_head *cur, *tmp;
char card_nr[2];

gCardIndex=0; //mbelian
unsigned long gCardIndex = 0;

DEBUG("Enter init_ft1000_netdev...\n");

Expand All @@ -794,9 +792,6 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)

dev_alloc_name(netdev, netdev->name);

//for the first inserted card, decide the card index beginning number, in case there are existing network interfaces
if ( gCardIndex == 0 )
{
DEBUG("init_ft1000_netdev: network device name is %s\n", netdev->name);

if ( strncmp(netdev->name,"eth", 3) == 0) {
Expand All @@ -816,13 +811,6 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
ret_val = -ENXIO;
goto err_net;
}
}
else
{
//not the first inserted card, increase card number by 1
pInfo->CardNumber = gCardIndex;
/*DEBUG("card number = %d\n", pInfo->CardNumber);*/ //mbelian
}

memset(&pInfo->stats, 0, sizeof(struct net_device_stats) );

Expand Down

0 comments on commit 448d401

Please sign in to comment.