Commit f5f8f4a9 authored by Chas Williams's avatar Chas Williams Committed by Hideaki Yoshifuji

[ATM]: Use sk_data_ready and sk_change_state instead of wake_up.

parent 072a9d39
......@@ -67,7 +67,7 @@ static int to_atmarpd(enum atmarp_ctrl_type type,int itf,unsigned long ip)
ctrl->ip = ip;
atm_force_charge(atmarpd,skb->truesize);
skb_queue_tail(&atmarpd->sk->sk_receive_queue, skb);
wake_up(atmarpd->sk->sk_sleep);
atmarpd->sk->sk_data_ready(atmarpd->sk, skb->len);
return 0;
}
......
......@@ -328,7 +328,7 @@ void vcc_release_async(struct atm_vcc *vcc, int reply)
set_bit(ATM_VF_CLOSE, &vcc->flags);
vcc->reply = reply;
vcc->sk->sk_err = -reply;
wake_up(vcc->sk->sk_sleep);
vcc->sk->sk_state_change(vcc->sk);
}
......
......@@ -134,7 +134,7 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
priv = (struct lec_priv *)dev->priv;
atm_force_charge(priv->lecd, skb2->truesize);
skb_queue_tail(&priv->lecd->sk->sk_receive_queue, skb2);
wake_up(priv->lecd->sk->sk_sleep);
priv->lecd->sk->sk_data_ready(priv->lecd->sk, skb2->len);
}
return;
......@@ -513,7 +513,7 @@ lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
memcpy(skb2->data, mesg, sizeof(struct atmlec_msg));
atm_force_charge(priv->lecd, skb2->truesize);
skb_queue_tail(&priv->lecd->sk->sk_receive_queue, skb2);
wake_up(priv->lecd->sk->sk_sleep);
priv->lecd->sk->sk_data_ready(priv->lecd->sk, skb2->len);
}
if (f != NULL) br_fdb_put_hook(f);
#endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */
......@@ -598,13 +598,13 @@ send_to_lecd(struct lec_priv *priv, atmlec_msg_type type,
atm_force_charge(priv->lecd, skb->truesize);
skb_queue_tail(&priv->lecd->sk->sk_receive_queue, skb);
wake_up(priv->lecd->sk->sk_sleep);
priv->lecd->sk->sk_data_ready(priv->lecd->sk, skb->len);
if (data != NULL) {
DPRINTK("lec: about to send %d bytes of data\n", data->len);
atm_force_charge(priv->lecd, data->truesize);
skb_queue_tail(&priv->lecd->sk->sk_receive_queue, data);
wake_up(priv->lecd->sk->sk_sleep);
priv->lecd->sk->sk_data_ready(priv->lecd->sk, skb->len);
}
return 0;
......@@ -686,7 +686,7 @@ lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
if (memcmp(skb->data, lec_ctrl_magic, 4) ==0) { /* Control frame, to daemon*/
DPRINTK("%s: To daemon\n",dev->name);
skb_queue_tail(&vcc->sk->sk_receive_queue, skb);
wake_up(vcc->sk->sk_sleep);
vcc->sk->sk_data_ready(vcc->sk, skb->len);
} else { /* Data frame, queue to protocol handlers */
unsigned char *dst;
......
......@@ -669,7 +669,7 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb)
dprintk("mpoa: (%s) mpc_push: control packet arrived\n", dev->name);
/* Pass control packets to daemon */
skb_queue_tail(&vcc->sk->sk_receive_queue, skb);
wake_up(vcc->sk->sk_sleep);
vcc->sk->sk_data_ready(vcc->sk, skb->len);
return;
}
......@@ -947,7 +947,7 @@ int msg_to_mpoad(struct k_message *mesg, struct mpoa_client *mpc)
memcpy(skb->data, mesg, sizeof(struct k_message));
atm_force_charge(mpc->mpoad_vcc, skb->truesize);
skb_queue_tail(&mpc->mpoad_vcc->sk->sk_receive_queue, skb);
wake_up(mpc->mpoad_vcc->sk->sk_sleep);
mpc->mpoad_vcc->sk->sk_data_ready(mpc->mpoad_vcc->sk, skb->len);
return 0;
}
......@@ -1226,7 +1226,7 @@ static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry)
atm_force_charge(vcc, skb->truesize);
skb_queue_tail(&vcc->sk->sk_receive_queue, skb);
wake_up(vcc->sk->sk_sleep);
vcc->sk->sk_data_ready(vcc->sk, skb->len);
dprintk("mpoa: purge_egress_shortcut: exiting:\n");
return;
......
......@@ -29,7 +29,7 @@ void atm_push_raw(struct atm_vcc *vcc,struct sk_buff *skb)
{
if (skb) {
skb_queue_tail(&vcc->sk->sk_receive_queue, skb);
wake_up(vcc->sk->sk_sleep);
vcc->sk->sk_data_ready(vcc->sk, skb->len);
}
}
......
......@@ -61,7 +61,7 @@ static void sigd_put_skb(struct sk_buff *skb)
#endif
atm_force_charge(sigd,skb->truesize);
skb_queue_tail(&sigd->sk->sk_receive_queue,skb);
wake_up(sigd->sk->sk_sleep);
sigd->sk->sk_data_ready(sigd->sk, skb->len);
}
......@@ -204,7 +204,7 @@ static void purge_vcc(struct atm_vcc *vcc)
set_bit(ATM_VF_RELEASED,&vcc->flags);
vcc->reply = -EUNATCH;
vcc->sk->sk_err = EUNATCH;
wake_up(vcc->sk->sk_sleep);
vcc->sk->sk_state_change(vcc->sk);
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment