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

solos: Add SNR and Attn to status packet, fix oops on load

Browse source 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2009-01-28 10:22:57 +11:00
parent b28a4b9a38
commit af7806560c
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -303,8 +303,8 @@ static char *next_string(struct sk_buff *skb)
*/ */
static int process_status(struct solos_card *card, int port, struct sk_buff *skb) static int process_status(struct solos_card *card, int port, struct sk_buff *skb)
{ {
char *str, *end; char *str, *end, *state_str;
int ver, rate_up, rate_down, state; int ver, rate_up, rate_down, state, snr, attn;
if (!card->atmdev[port]) if (!card->atmdev[port])
return -ENODEV; return -ENODEV;
@ -330,19 +330,35 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
if (*end) if (*end)
return -EIO; return -EIO;
str = next_string(skb); state_str = next_string(skb);
if (!strcmp(str, "Showtime")) if (!strcmp(state_str, "Showtime"))
state = ATM_PHY_SIG_FOUND; state = ATM_PHY_SIG_FOUND;
else { else {
state = ATM_PHY_SIG_LOST; state = ATM_PHY_SIG_LOST;
release_vccs(card->atmdev[port]); release_vccs(card->atmdev[port]);
} }
str = next_string(skb);
snr = simple_strtol(str, &end, 10);
if (*end)
return -EIO;
str = next_string(skb);
attn = simple_strtol(str, &end, 10);
if (*end)
return -EIO;
if (state == ATM_PHY_SIG_LOST && !rate_up && !rate_down)
dev_info(&card->dev->dev, "Port %d ATM state: %s\n",
port, state_str);
else
dev_info(&card->dev->dev, "Port %d ATM state: %s (%d/%d kb/s, SNR %ddB, Attn %ddB)\n",
port, state_str, rate_up/1000, rate_down/1000,
snr, attn);
card->atmdev[port]->link_rate = rate_down; card->atmdev[port]->link_rate = rate_down;
card->atmdev[port]->signal = state; card->atmdev[port]->signal = state;
dev_info(&card->dev->dev, "ATM state: '%s', %d/%d kb/s up/down.\n",
str, rate_up/1000, rate_down/1000);
return 0; return 0;
} }
@ -851,7 +867,7 @@ static int fpga_tx(struct solos_card *card)
dev_vdbg(&card->dev->dev, "TX Flags are %X\n", tx_pending); dev_vdbg(&card->dev->dev, "TX Flags are %X\n", tx_pending);
for (port = 0; port < card->nr_ports; port++) { for (port = 0; port < card->nr_ports; port++) {
if (!(tx_pending & (1 << port))) { if (card->atmdev[port] && !(tx_pending & (1 << port))) {
spin_lock(&card->tx_queue_lock); spin_lock(&card->tx_queue_lock);
skb = skb_dequeue(&card->tx_queue[port]); skb = skb_dequeue(&card->tx_queue[port]);