summaryrefslogtreecommitdiff
path: root/drivers/atm
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-01-27 13:47:47 +0300
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-01-27 13:47:47 +0300
commit1e615df654ef00a6354f32be08a8fb6a395b2ef1 (patch)
tree0bd9faec5035ad9e4b68b8c481087dfe0b0fe309 /drivers/atm
parent87ebb18627930ce005beba227ca267b5b5372e06 (diff)
downloadlinux-1e615df654ef00a6354f32be08a8fb6a395b2ef1.tar.xz
solos: Kill existing connections on link down event
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/solos-pci.c30
1 files changed, 28 insertions, 2 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 4c87dfb01566..c289b6251c19 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -132,6 +132,7 @@ static int fpga_tx(struct solos_card *);
static irqreturn_t solos_irq(int irq, void *dev_id);
static struct atm_vcc* find_vcc(struct atm_dev *dev, short vpi, int vci);
static int list_vccs(int vci);
+static void release_vccs(struct atm_dev *dev);
static int atm_init(struct solos_card *);
static void atm_remove(struct solos_card *);
static int send_command(struct solos_card *card, int dev, const char *buf, size_t size);
@@ -332,7 +333,10 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
str = next_string(skb);
if (!strcmp(str, "Showtime"))
state = ATM_PHY_SIG_FOUND;
- else state = ATM_PHY_SIG_LOST;
+ else {
+ state = ATM_PHY_SIG_LOST;
+ release_vccs(card->atmdev[port]);
+ }
card->atmdev[port]->link_rate = rate_down;
card->atmdev[port]->signal = state;
@@ -683,7 +687,7 @@ static int list_vccs(int vci)
vcc->vci);
}
} else {
- for(i=0; i<32; i++){
+ for(i = 0; i < VCC_HTABLE_SIZE; i++){
head = &vcc_hash[i];
sk_for_each(s, node, head) {
num_found ++;
@@ -699,6 +703,28 @@ static int list_vccs(int vci)
return num_found;
}
+static void release_vccs(struct atm_dev *dev)
+{
+ int i;
+
+ write_lock_irq(&vcc_sklist_lock);
+ for (i = 0; i < VCC_HTABLE_SIZE; i++) {
+ struct hlist_head *head = &vcc_hash[i];
+ struct hlist_node *node, *tmp;
+ struct sock *s;
+ struct atm_vcc *vcc;
+
+ sk_for_each_safe(s, node, tmp, head) {
+ vcc = atm_sk(s);
+ if (vcc->dev == dev) {
+ vcc_release_async(vcc, -EPIPE);
+ sk_del_node_init(s);
+ }
+ }
+ }
+ write_unlock_irq(&vcc_sklist_lock);
+}
+
static int popen(struct atm_vcc *vcc)
{