aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-01-30 14:23:52 +1100
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-01-30 14:23:52 +1100
commit95852f48c2b78ee6b211a38039ccca2c889a7010 (patch)
tree95ca2b00cdb881c39c5d75dcc495a2290836f242
parentcc3657e1f6d552a88307af62f53380503ba0130b (diff)
solos: Tidy up status interrupt handling, cope with 'ERROR' status
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/atm/solos-pci.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index c54ecebc9a7..f27bd922574 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -340,6 +340,12 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
str = next_string(skb);
if (!str)
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);
if (*end)
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) {
- dev_info(&card->dev->dev, "Port %d ATM state: %s\n",
- port, state_str);
+ dev_info(&card->dev->dev, "Port %d: %s\n", port, state_str);
} else {
char *snr, *attn;
@@ -374,7 +379,7 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
if (!attn)
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,
snr[0]?", SNR ":"", snr, attn[0]?", Attn ":"", attn);
}
@@ -663,7 +668,11 @@ void solos_bh(unsigned long card_arg)
break;
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);
break;