Skip to content

L
linux
Commit 0ec96e65 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files
Options

net/atm/signaling.c: checkpatch cleanups 

Mostly 80 column wrapped.
Move embedded assigns out of tests
Move trailing statements to new lines
switch/case cleanups
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 07b54c9a
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 101 deletions
net/atm/signaling.c
View file @ 0ec96e65
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include "resources.h" #include "resources.h"
#include "signaling.h" #include "signaling.h"
#undef WAIT_FOR_DEMON /* #define this if system calls on SVC sockets #undef WAIT_FOR_DEMON /* #define this if system calls on SVC sockets
should block until the demon runs. should block until the demon runs.
Danger: may cause nasty hangs if the demon Danger: may cause nasty hangs if the demon
...@@ -29,20 +28,19 @@ struct atm_vcc *sigd = NULL; ...@@ -29,20 +28,19 @@ struct atm_vcc *sigd = NULL;
static DECLARE_WAIT_QUEUE_HEAD(sigd_sleep); static DECLARE_WAIT_QUEUE_HEAD(sigd_sleep);
#endif #endif
static void sigd_put_skb(struct sk_buff *skb) static void sigd_put_skb(struct sk_buff *skb)
{ {
#ifdef WAIT_FOR_DEMON #ifdef WAIT_FOR_DEMON
DECLARE_WAITQUEUE(wait,current); DECLARE_WAITQUEUE(wait, current);
add_wait_queue(&sigd_sleep,&wait); add_wait_queue(&sigd_sleep, &wait);
while (!sigd) { while (!sigd) {
set_current_state(TASK_UNINTERRUPTIBLE); set_current_state(TASK_UNINTERRUPTIBLE);
pr_debug("atmsvc: waiting for signaling daemon...\n"); pr_debug("atmsvc: waiting for signaling daemon...\n");
schedule(); schedule();
} }
current->state = TASK_RUNNING; current->state = TASK_RUNNING;
remove_wait_queue(&sigd_sleep,&wait); remove_wait_queue(&sigd_sleep, &wait);
#else #else
if (!sigd) { if (!sigd) {
pr_debug("atmsvc: no signaling daemon\n"); pr_debug("atmsvc: no signaling daemon\n");
...@@ -50,39 +48,39 @@ static void sigd_put_skb(struct sk_buff *skb) ...@@ -50,39 +48,39 @@ static void sigd_put_skb(struct sk_buff *skb)
return; return;
} }
#endif #endif
atm_force_charge(sigd,skb->truesize); atm_force_charge(sigd, skb->truesize);
skb_queue_tail(&sk_atm(sigd)->sk_receive_queue,skb); skb_queue_tail(&sk_atm(sigd)->sk_receive_queue, skb);
sk_atm(sigd)->sk_data_ready(sk_atm(sigd), skb->len); sk_atm(sigd)->sk_data_ready(sk_atm(sigd), skb->len);
} }
static void modify_qos(struct atm_vcc *vcc, struct atmsvc_msg *msg)
static void modify_qos(struct atm_vcc *vcc,struct atmsvc_msg *msg)
{ {
struct sk_buff *skb; struct sk_buff *skb;
if (test_bit(ATM_VF_RELEASED,&vcc->flags) || if (test_bit(ATM_VF_RELEASED, &vcc->flags) ||
!test_bit(ATM_VF_READY,&vcc->flags)) !test_bit(ATM_VF_READY, &vcc->flags))
return; return;
msg->type = as_error; msg->type = as_error;
if (!vcc->dev->ops->change_qos) msg->reply = -EOPNOTSUPP; if (!vcc->dev->ops->change_qos)
msg->reply = -EOPNOTSUPP;
else { else {
/* should lock VCC */ /* should lock VCC */
msg->reply = vcc->dev->ops->change_qos(vcc,&msg->qos, msg->reply = vcc->dev->ops->change_qos(vcc, &msg->qos,
msg->reply); msg->reply);
if (!msg->reply) msg->type = as_okay; if (!msg->reply)
msg->type = as_okay;
} }
/* /*
* Should probably just turn around the old skb. But the, the buffer * Should probably just turn around the old skb. But the, the buffer
* space accounting needs to follow the change too. Maybe later. * space accounting needs to follow the change too. Maybe later.
*/ */
while (!(skb = alloc_skb(sizeof(struct atmsvc_msg),GFP_KERNEL))) while (!(skb = alloc_skb(sizeof(struct atmsvc_msg), GFP_KERNEL)))
schedule(); schedule();
*(struct atmsvc_msg *) skb_put(skb,sizeof(struct atmsvc_msg)) = *msg; *(struct atmsvc_msg *)skb_put(skb, sizeof(struct atmsvc_msg)) = *msg;
sigd_put_skb(skb); sigd_put_skb(skb);
} }
static int sigd_send(struct atm_vcc *vcc, struct sk_buff *skb)
static int sigd_send(struct atm_vcc *vcc,struct sk_buff *skb)
{ {
struct atmsvc_msg *msg; struct atmsvc_msg *msg;
struct atm_vcc *session_vcc; struct atm_vcc *session_vcc;
...@@ -95,63 +93,64 @@ static int sigd_send(struct atm_vcc *vcc,struct sk_buff *skb) ...@@ -95,63 +93,64 @@ static int sigd_send(struct atm_vcc *vcc,struct sk_buff *skb)
sk = sk_atm(vcc); sk = sk_atm(vcc);
switch (msg->type) { switch (msg->type) {
case as_okay: case as_okay:
sk->sk_err = -msg->reply; sk->sk_err = -msg->reply;
clear_bit(ATM_VF_WAITING, &vcc->flags); clear_bit(ATM_VF_WAITING, &vcc->flags);
if (!*vcc->local.sas_addr.prv && if (!*vcc->local.sas_addr.prv && !*vcc->local.sas_addr.pub) {
!*vcc->local.sas_addr.pub) { vcc->local.sas_family = AF_ATMSVC;
vcc->local.sas_family = AF_ATMSVC; memcpy(vcc->local.sas_addr.prv,
memcpy(vcc->local.sas_addr.prv, msg->local.sas_addr.prv, ATM_ESA_LEN);
msg->local.sas_addr.prv,ATM_ESA_LEN); memcpy(vcc->local.sas_addr.pub,
memcpy(vcc->local.sas_addr.pub, msg->local.sas_addr.pub, ATM_E164_LEN + 1);
msg->local.sas_addr.pub,ATM_E164_LEN+1); }
} session_vcc = vcc->session ? vcc->session : vcc;
session_vcc = vcc->session ? vcc->session : vcc; if (session_vcc->vpi || session_vcc->vci)
if (session_vcc->vpi || session_vcc->vci) break;
session_vcc->itf = msg->pvc.sap_addr.itf;
session_vcc->vpi = msg->pvc.sap_addr.vpi;
session_vcc->vci = msg->pvc.sap_addr.vci;
if (session_vcc->vpi || session_vcc->vci)
session_vcc->qos = msg->qos;
break;
case as_error:
clear_bit(ATM_VF_REGIS,&vcc->flags);
clear_bit(ATM_VF_READY,&vcc->flags);
sk->sk_err = -msg->reply;
clear_bit(ATM_VF_WAITING, &vcc->flags);
break; break;
case as_indicate: session_vcc->itf = msg->pvc.sap_addr.itf;
vcc = *(struct atm_vcc **) &msg->listen_vcc; session_vcc->vpi = msg->pvc.sap_addr.vpi;
sk = sk_atm(vcc); session_vcc->vci = msg->pvc.sap_addr.vci;
pr_debug("as_indicate!!!\n"); if (session_vcc->vpi || session_vcc->vci)
lock_sock(sk); session_vcc->qos = msg->qos;
if (sk_acceptq_is_full(sk)) { break;
sigd_enq(NULL,as_reject,vcc,NULL,NULL); case as_error:
dev_kfree_skb(skb); clear_bit(ATM_VF_REGIS, &vcc->flags);
goto as_indicate_complete; clear_bit(ATM_VF_READY, &vcc->flags);
} sk->sk_err = -msg->reply;
sk->sk_ack_backlog++; clear_bit(ATM_VF_WAITING, &vcc->flags);
skb_queue_tail(&sk->sk_receive_queue, skb); break;
pr_debug("waking sk->sk_sleep 0x%p\n", sk->sk_sleep); case as_indicate:
sk->sk_state_change(sk); vcc = *(struct atm_vcc **)&msg->listen_vcc;
sk = sk_atm(vcc);
pr_debug("as_indicate!!!\n");
lock_sock(sk);
if (sk_acceptq_is_full(sk)) {
sigd_enq(NULL, as_reject, vcc, NULL, NULL);
dev_kfree_skb(skb);
goto as_indicate_complete;
}
sk->sk_ack_backlog++;
skb_queue_tail(&sk->sk_receive_queue, skb);
pr_debug("waking sk->sk_sleep 0x%p\n", sk->sk_sleep);
sk->sk_state_change(sk);
as_indicate_complete: as_indicate_complete:
release_sock(sk); release_sock(sk);
return 0; return 0;
case as_close: case as_close:
set_bit(ATM_VF_RELEASED,&vcc->flags); set_bit(ATM_VF_RELEASED, &vcc->flags);
vcc_release_async(vcc, msg->reply); vcc_release_async(vcc, msg->reply);
goto out; goto out;
case as_modify: case as_modify:
modify_qos(vcc,msg); modify_qos(vcc, msg);
break; break;
case as_addparty: case as_addparty:
case as_dropparty: case as_dropparty:
sk->sk_err_soft = msg->reply; /* < 0 failure, otherwise ep_ref */ sk->sk_err_soft = msg->reply;
clear_bit(ATM_VF_WAITING, &vcc->flags); /* < 0 failure, otherwise ep_ref */
break; clear_bit(ATM_VF_WAITING, &vcc->flags);
default: break;
pr_alert("bad message type %d\n", (int)msg->type); default:
return -EINVAL; pr_alert("bad message type %d\n", (int)msg->type);
return -EINVAL;
} }
sk->sk_state_change(sk); sk->sk_state_change(sk);
out: out:
...@@ -159,48 +158,52 @@ static int sigd_send(struct atm_vcc *vcc,struct sk_buff *skb) ...@@ -159,48 +158,52 @@ static int sigd_send(struct atm_vcc *vcc,struct sk_buff *skb)
return 0; return 0;
} }
void sigd_enq2(struct atm_vcc *vcc, enum atmsvc_msg_type type,
void sigd_enq2(struct atm_vcc *vcc,enum atmsvc_msg_type type, struct atm_vcc *listen_vcc, const struct sockaddr_atmpvc *pvc,
struct atm_vcc *listen_vcc,const struct sockaddr_atmpvc *pvc, const struct sockaddr_atmsvc *svc, const struct atm_qos *qos,
const struct sockaddr_atmsvc *svc,const struct atm_qos *qos,int reply) int reply)
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct atmsvc_msg *msg; struct atmsvc_msg *msg;
static unsigned session = 0; static unsigned session = 0;
pr_debug("%d (0x%p)\n", (int)type, vcc); pr_debug("%d (0x%p)\n", (int)type, vcc);
while (!(skb = alloc_skb(sizeof(struct atmsvc_msg),GFP_KERNEL))) while (!(skb = alloc_skb(sizeof(struct atmsvc_msg), GFP_KERNEL)))
schedule(); schedule();
msg = (struct atmsvc_msg *) skb_put(skb,sizeof(struct atmsvc_msg)); msg = (struct atmsvc_msg *)skb_put(skb, sizeof(struct atmsvc_msg));
memset(msg,0,sizeof(*msg)); memset(msg, 0, sizeof(*msg));
msg->type = type; msg->type = type;
*(struct atm_vcc **) &msg->vcc = vcc; *(struct atm_vcc **) &msg->vcc = vcc;
*(struct atm_vcc **) &msg->listen_vcc = listen_vcc; *(struct atm_vcc **) &msg->listen_vcc = listen_vcc;
msg->reply = reply; msg->reply = reply;
if (qos) msg->qos = *qos; if (qos)
if (vcc) msg->sap = vcc->sap; msg->qos = *qos;
if (svc) msg->svc = *svc; if (vcc)
if (vcc) msg->local = vcc->local; msg->sap = vcc->sap;
if (pvc) msg->pvc = *pvc; if (svc)
msg->svc = *svc;
if (vcc)
msg->local = vcc->local;
if (pvc)
msg->pvc = *pvc;
if (vcc) { if (vcc) {
if (type == as_connect && test_bit(ATM_VF_SESSION, &vcc->flags)) if (type == as_connect && test_bit(ATM_VF_SESSION, &vcc->flags))
msg->session = ++session; msg->session = ++session;
/* every new pmp connect gets the next session number */ /* every new pmp connect gets the next session number */
} }
sigd_put_skb(skb); sigd_put_skb(skb);
if (vcc) set_bit(ATM_VF_REGIS,&vcc->flags); if (vcc)
set_bit(ATM_VF_REGIS, &vcc->flags);
} }
void sigd_enq(struct atm_vcc *vcc, enum atmsvc_msg_type type,
void sigd_enq(struct atm_vcc *vcc,enum atmsvc_msg_type type, struct atm_vcc *listen_vcc, const struct sockaddr_atmpvc *pvc,
struct atm_vcc *listen_vcc,const struct sockaddr_atmpvc *pvc, const struct sockaddr_atmsvc *svc)
const struct sockaddr_atmsvc *svc)
{ {
sigd_enq2(vcc,type,listen_vcc,pvc,svc,vcc ? &vcc->qos : NULL,0); sigd_enq2(vcc, type, listen_vcc, pvc, svc, vcc ? &vcc->qos : NULL, 0);
/* other ISP applications may use "reply" */ /* other ISP applications may use "reply" */
} }
static void purge_vcc(struct atm_vcc *vcc) static void purge_vcc(struct atm_vcc *vcc)
{ {
if (sk_atm(vcc)->sk_family == PF_ATMSVC && if (sk_atm(vcc)->sk_family == PF_ATMSVC &&
...@@ -211,7 +214,6 @@ static void purge_vcc(struct atm_vcc *vcc) ...@@ -211,7 +214,6 @@ static void purge_vcc(struct atm_vcc *vcc)
} }
} }
static void sigd_close(struct atm_vcc *vcc) static void sigd_close(struct atm_vcc *vcc)
{ {
struct hlist_node *node; struct hlist_node *node;
...@@ -225,7 +227,7 @@ static void sigd_close(struct atm_vcc *vcc) ...@@ -225,7 +227,7 @@ static void sigd_close(struct atm_vcc *vcc)
skb_queue_purge(&sk_atm(vcc)->sk_receive_queue); skb_queue_purge(&sk_atm(vcc)->sk_receive_queue);
read_lock(&vcc_sklist_lock); read_lock(&vcc_sklist_lock);
for(i = 0; i < VCC_HTABLE_SIZE; ++i) { for (i = 0; i < VCC_HTABLE_SIZE; ++i) {
struct hlist_head *head = &vcc_hash[i]; struct hlist_head *head = &vcc_hash[i];
sk_for_each(s, node, head) { sk_for_each(s, node, head) {
...@@ -237,13 +239,11 @@ static void sigd_close(struct atm_vcc *vcc) ...@@ -237,13 +239,11 @@ static void sigd_close(struct atm_vcc *vcc)
read_unlock(&vcc_sklist_lock); read_unlock(&vcc_sklist_lock);
} }
static struct atmdev_ops sigd_dev_ops = { static struct atmdev_ops sigd_dev_ops = {
.close = sigd_close, .close = sigd_close,
.send = sigd_send .send = sigd_send
}; };
static struct atm_dev sigd_dev = { static struct atm_dev sigd_dev = {
.ops = &sigd_dev_ops, .ops = &sigd_dev_ops,
.type = "sig", .type = "sig",
...@@ -251,16 +251,16 @@ static struct atm_dev sigd_dev = { ...@@ -251,16 +251,16 @@ static struct atm_dev sigd_dev = {
.lock = __SPIN_LOCK_UNLOCKED(sigd_dev.lock) .lock = __SPIN_LOCK_UNLOCKED(sigd_dev.lock)
}; };
int sigd_attach(struct atm_vcc *vcc) int sigd_attach(struct atm_vcc *vcc)
{ {
if (sigd) return -EADDRINUSE; if (sigd)
return -EADDRINUSE;
pr_debug("\n"); pr_debug("\n");
sigd = vcc; sigd = vcc;
vcc->dev = &sigd_dev; vcc->dev = &sigd_dev;
vcc_insert_socket(sk_atm(vcc)); vcc_insert_socket(sk_atm(vcc));
set_bit(ATM_VF_META,&vcc->flags); set_bit(ATM_VF_META, &vcc->flags);
set_bit(ATM_VF_READY,&vcc->flags); set_bit(ATM_VF_READY, &vcc->flags);
#ifdef WAIT_FOR_DEMON #ifdef WAIT_FOR_DEMON
wake_up(&sigd_sleep); wake_up(&sigd_sleep);
#endif #endif
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7