Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

solos: Tidy up status interrupt handling, cope with 'ERROR' status

Browse source 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2009-01-30 14:23:52 +11:00
parent cc3657e1f6
commit 95852f48c2
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/atm/solos-pci.c
View file

@ -340,6 +340,12 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
str = next_string(skb); str = next_string(skb);
if (!str) if (!str)
return -EIO; return -EIO;
if (!strcmp(str, "ERROR")) {
dev_dbg(&card->dev->dev, "Status packet indicated Solos error on port %d (starting up?)\n",
port);
return 0;
}
rate_up = simple_strtol(str, &end, 10); rate_up = simple_strtol(str, &end, 10);
if (*end) if (*end)
return -EIO; return -EIO;
@ -362,8 +368,7 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
} }
if (state == ATM_PHY_SIG_LOST) { if (state == ATM_PHY_SIG_LOST) {
dev_info(&card->dev->dev, "Port %d ATM state: %s\n", dev_info(&card->dev->dev, "Port %d: %s\n", port, state_str);
port, state_str);
} else { } else {
char *snr, *attn; char *snr, *attn;
@ -374,7 +379,7 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
if (!attn) if (!attn)
return -EIO; return -EIO;
dev_info(&card->dev->dev, "Port %d: %s (%d/%d kb/s%s%s%s%s)\n", dev_info(&card->dev->dev, "Port %d: %s @%d/%d kb/s%s%s%s%s\n",
port, state_str, rate_down/1000, rate_up/1000, port, state_str, rate_down/1000, rate_up/1000,
snr[0]?", SNR ":"", snr, attn[0]?", Attn ":"", attn); snr[0]?", SNR ":"", snr, attn[0]?", Attn ":"", attn);
} }
@ -663,7 +668,11 @@ void solos_bh(unsigned long card_arg)
break; break;
case PKT_STATUS: case PKT_STATUS:
process_status(card, port, skb); if (process_status(card, port, skb) &&
net_ratelimit()) {
dev_warn(&card->dev->dev, "Bad status packet of %d bytes on port %d:\n", skb->len, port);
print_buffer(skb);
}
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
break; break;