diff options
Diffstat (limited to 'drivers/isdn/mISDN/l1oip_core.c')
-rw-r--r-- | drivers/isdn/mISDN/l1oip_core.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index ea3c3aa2004..d9cf83b17e3 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c | |||
@@ -308,8 +308,8 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask, | |||
308 | 308 | ||
309 | /* assemble frame */ | 309 | /* assemble frame */ |
310 | *p++ = (L1OIP_VERSION<<6) /* version and coding */ | 310 | *p++ = (L1OIP_VERSION<<6) /* version and coding */ |
311 | | (hc->pri?0x20:0x00) /* type */ | 311 | | (hc->pri ? 0x20 : 0x00) /* type */ |
312 | | (hc->id?0x10:0x00) /* id */ | 312 | | (hc->id ? 0x10 : 0x00) /* id */ |
313 | | localcodec; | 313 | | localcodec; |
314 | if (hc->id) { | 314 | if (hc->id) { |
315 | *p++ = hc->id>>24; /* id */ | 315 | *p++ = hc->id>>24; /* id */ |
@@ -317,7 +317,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask, | |||
317 | *p++ = hc->id>>8; | 317 | *p++ = hc->id>>8; |
318 | *p++ = hc->id; | 318 | *p++ = hc->id; |
319 | } | 319 | } |
320 | *p++ = (multi == 1)?0x80:0x00 + channel; /* m-flag, channel */ | 320 | *p++ = (multi == 1) ? 0x80 : 0x00 + channel; /* m-flag, channel */ |
321 | if (multi == 1) | 321 | if (multi == 1) |
322 | *p++ = len; /* length */ | 322 | *p++ = len; /* length */ |
323 | *p++ = timebase>>8; /* time base */ | 323 | *p++ = timebase>>8; /* time base */ |
@@ -401,12 +401,12 @@ l1oip_socket_recv(struct l1oip *hc, u8 remotecodec, u8 channel, u16 timebase, | |||
401 | } | 401 | } |
402 | 402 | ||
403 | /* prepare message */ | 403 | /* prepare message */ |
404 | nskb = mI_alloc_skb((remotecodec == 3)?(len<<1):len, GFP_ATOMIC); | 404 | nskb = mI_alloc_skb((remotecodec == 3) ? (len<<1) : len, GFP_ATOMIC); |
405 | if (!nskb) { | 405 | if (!nskb) { |
406 | printk(KERN_ERR "%s: No mem for skb.\n", __func__); | 406 | printk(KERN_ERR "%s: No mem for skb.\n", __func__); |
407 | return; | 407 | return; |
408 | } | 408 | } |
409 | p = skb_put(nskb, (remotecodec == 3)?(len<<1):len); | 409 | p = skb_put(nskb, (remotecodec == 3) ? (len<<1) : len); |
410 | 410 | ||
411 | if (remotecodec == 1 && ulaw) | 411 | if (remotecodec == 1 && ulaw) |
412 | l1oip_alaw_to_ulaw(buf, len, p); | 412 | l1oip_alaw_to_ulaw(buf, len, p); |
@@ -458,7 +458,7 @@ l1oip_socket_recv(struct l1oip *hc, u8 remotecodec, u8 channel, u16 timebase, | |||
458 | hc->chan[channel].disorder_flag ^= 1; | 458 | hc->chan[channel].disorder_flag ^= 1; |
459 | if (nskb) | 459 | if (nskb) |
460 | #endif | 460 | #endif |
461 | queue_ch_frame(&bch->ch, PH_DATA_IND, rx_counter, nskb); | 461 | queue_ch_frame(&bch->ch, PH_DATA_IND, rx_counter, nskb); |
462 | } | 462 | } |
463 | } | 463 | } |
464 | 464 | ||
@@ -749,8 +749,8 @@ l1oip_socket_thread(void *data) | |||
749 | l1oip_socket_parse(hc, &sin_rx, recvbuf, recvlen); | 749 | l1oip_socket_parse(hc, &sin_rx, recvbuf, recvlen); |
750 | } else { | 750 | } else { |
751 | if (debug & DEBUG_L1OIP_SOCKET) | 751 | if (debug & DEBUG_L1OIP_SOCKET) |
752 | printk(KERN_WARNING "%s: broken pipe on socket\n", | 752 | printk(KERN_WARNING |
753 | __func__); | 753 | "%s: broken pipe on socket\n", __func__); |
754 | } | 754 | } |
755 | } | 755 | } |
756 | 756 | ||
@@ -925,7 +925,7 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb) | |||
925 | p = skb->data; | 925 | p = skb->data; |
926 | l = skb->len; | 926 | l = skb->len; |
927 | while (l) { | 927 | while (l) { |
928 | ll = (l < L1OIP_MAX_PERFRAME)?l:L1OIP_MAX_PERFRAME; | 928 | ll = (l < L1OIP_MAX_PERFRAME) ? l : L1OIP_MAX_PERFRAME; |
929 | l1oip_socket_send(hc, 0, dch->slot, 0, | 929 | l1oip_socket_send(hc, 0, dch->slot, 0, |
930 | hc->chan[dch->slot].tx_counter++, p, ll); | 930 | hc->chan[dch->slot].tx_counter++, p, ll); |
931 | p += ll; | 931 | p += ll; |
@@ -1173,7 +1173,7 @@ handle_bmsg(struct mISDNchannel *ch, struct sk_buff *skb) | |||
1173 | p = skb->data; | 1173 | p = skb->data; |
1174 | l = skb->len; | 1174 | l = skb->len; |
1175 | while (l) { | 1175 | while (l) { |
1176 | ll = (l < L1OIP_MAX_PERFRAME)?l:L1OIP_MAX_PERFRAME; | 1176 | ll = (l < L1OIP_MAX_PERFRAME) ? l : L1OIP_MAX_PERFRAME; |
1177 | l1oip_socket_send(hc, hc->codec, bch->slot, 0, | 1177 | l1oip_socket_send(hc, hc->codec, bch->slot, 0, |
1178 | hc->chan[bch->slot].tx_counter, p, ll); | 1178 | hc->chan[bch->slot].tx_counter, p, ll); |
1179 | hc->chan[bch->slot].tx_counter += ll; | 1179 | hc->chan[bch->slot].tx_counter += ll; |
@@ -1331,8 +1331,8 @@ init_card(struct l1oip *hc, int pri, int bundle) | |||
1331 | spin_lock_init(&hc->socket_lock); | 1331 | spin_lock_init(&hc->socket_lock); |
1332 | hc->idx = l1oip_cnt; | 1332 | hc->idx = l1oip_cnt; |
1333 | hc->pri = pri; | 1333 | hc->pri = pri; |
1334 | hc->d_idx = pri?16:3; | 1334 | hc->d_idx = pri ? 16 : 3; |
1335 | hc->b_num = pri?30:2; | 1335 | hc->b_num = pri ? 30 : 2; |
1336 | hc->bundle = bundle; | 1336 | hc->bundle = bundle; |
1337 | if (hc->pri) | 1337 | if (hc->pri) |
1338 | sprintf(hc->name, "l1oip-e1.%d", l1oip_cnt + 1); | 1338 | sprintf(hc->name, "l1oip-e1.%d", l1oip_cnt + 1); |
@@ -1517,9 +1517,9 @@ l1oip_init(void) | |||
1517 | 1517 | ||
1518 | if (debug & DEBUG_L1OIP_INIT) | 1518 | if (debug & DEBUG_L1OIP_INIT) |
1519 | printk(KERN_DEBUG "%s: interface %d is %s with %s.\n", | 1519 | printk(KERN_DEBUG "%s: interface %d is %s with %s.\n", |
1520 | __func__, l1oip_cnt, pri?"PRI":"BRI", | 1520 | __func__, l1oip_cnt, pri ? "PRI" : "BRI", |
1521 | bundle?"bundled IP packet for all B-channels" | 1521 | bundle ? "bundled IP packet for all B-channels" : |
1522 | :"seperate IP packets for every B-channel"); | 1522 | "seperate IP packets for every B-channel"); |
1523 | 1523 | ||
1524 | hc = kzalloc(sizeof(struct l1oip), GFP_ATOMIC); | 1524 | hc = kzalloc(sizeof(struct l1oip), GFP_ATOMIC); |
1525 | if (!hc) { | 1525 | if (!hc) { |