aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/atm/solos-pci.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2010-08-09 20:02:33 -0400
committerNeilBrown <neilb@suse.de>2010-08-09 20:02:33 -0400
commitfd8aa2c1811bf60ccb2d5de0579c6f62aec1772d (patch)
tree311567d03758afc3a93b4273fe172836e89bb01d /drivers/atm/solos-pci.c
parent6e17b0276452912cb13445e5ea552b599984675f (diff)
parent2144381da478cc4aa3a29ee29b0c5e6ddaaced14 (diff)
Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus
Diffstat (limited to 'drivers/atm/solos-pci.c')
-rw-r--r--drivers/atm/solos-pci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index ded76c4c9f4f..6174965d9a4d 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -383,7 +383,7 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
383 383
384 /* Anything but 'Showtime' is down */ 384 /* Anything but 'Showtime' is down */
385 if (strcmp(state_str, "Showtime")) { 385 if (strcmp(state_str, "Showtime")) {
386 card->atmdev[port]->signal = ATM_PHY_SIG_LOST; 386 atm_dev_signal_change(card->atmdev[port], ATM_PHY_SIG_LOST);
387 release_vccs(card->atmdev[port]); 387 release_vccs(card->atmdev[port]);
388 dev_info(&card->dev->dev, "Port %d: %s\n", port, state_str); 388 dev_info(&card->dev->dev, "Port %d: %s\n", port, state_str);
389 return 0; 389 return 0;
@@ -401,7 +401,7 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
401 snr[0]?", SNR ":"", snr, attn[0]?", Attn ":"", attn); 401 snr[0]?", SNR ":"", snr, attn[0]?", Attn ":"", attn);
402 402
403 card->atmdev[port]->link_rate = rate_down / 424; 403 card->atmdev[port]->link_rate = rate_down / 424;
404 card->atmdev[port]->signal = ATM_PHY_SIG_FOUND; 404 atm_dev_signal_change(card->atmdev[port], ATM_PHY_SIG_FOUND);
405 405
406 return 0; 406 return 0;
407} 407}
@@ -1246,7 +1246,7 @@ static int atm_init(struct solos_card *card)
1246 card->atmdev[i]->ci_range.vci_bits = 16; 1246 card->atmdev[i]->ci_range.vci_bits = 16;
1247 card->atmdev[i]->dev_data = card; 1247 card->atmdev[i]->dev_data = card;
1248 card->atmdev[i]->phy_data = (void *)(unsigned long)i; 1248 card->atmdev[i]->phy_data = (void *)(unsigned long)i;
1249 card->atmdev[i]->signal = ATM_PHY_SIG_UNKNOWN; 1249 atm_dev_signal_change(card->atmdev[i], ATM_PHY_SIG_UNKNOWN);
1250 1250
1251 skb = alloc_skb(sizeof(*header), GFP_ATOMIC); 1251 skb = alloc_skb(sizeof(*header), GFP_ATOMIC);
1252 if (!skb) { 1252 if (!skb) {