diff options
author | Hannes Eder <hannes@hanneseder.net> | 2008-12-13 00:17:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-13 00:17:38 -0500 |
commit | 863a76e5881abe276a55c4490607a960790c5b0b (patch) | |
tree | b86f32f8181dcfa86463ec5b630077ac89d2d1aa /drivers/isdn | |
parent | bb68b1d964f89b19dc13d4f685a7d29616e2a4cb (diff) |
mISDN: fix sparse warning: symbol 'id' shadows an earlier one
Impact: rename function scope variable
Fix this warning:
drivers/isdn/mISDN/l1oip_core.c:472:8: warning: symbol 'id' shadows an earlier one
drivers/isdn/mISDN/l1oip_core.c:254:14: originally declared here
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/mISDN/l1oip_core.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index e42150a5778..0884dd6892f 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c | |||
@@ -469,7 +469,7 @@ l1oip_socket_recv(struct l1oip *hc, u8 remotecodec, u8 channel, u16 timebase, | |||
469 | static void | 469 | static void |
470 | l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len) | 470 | l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len) |
471 | { | 471 | { |
472 | u32 id; | 472 | u32 packet_id; |
473 | u8 channel; | 473 | u8 channel; |
474 | u8 remotecodec; | 474 | u8 remotecodec; |
475 | u16 timebase; | 475 | u16 timebase; |
@@ -508,7 +508,7 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len) | |||
508 | } | 508 | } |
509 | 509 | ||
510 | /* get id flag */ | 510 | /* get id flag */ |
511 | id = (*buf>>4)&1; | 511 | packet_id = (*buf>>4)&1; |
512 | 512 | ||
513 | /* check coding */ | 513 | /* check coding */ |
514 | remotecodec = (*buf) & 0x0f; | 514 | remotecodec = (*buf) & 0x0f; |
@@ -520,11 +520,11 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len) | |||
520 | buf++; | 520 | buf++; |
521 | len--; | 521 | len--; |
522 | 522 | ||
523 | /* check id */ | 523 | /* check packet_id */ |
524 | if (id) { | 524 | if (packet_id) { |
525 | if (!hc->id) { | 525 | if (!hc->id) { |
526 | printk(KERN_WARNING "%s: packet error - packet has id " | 526 | printk(KERN_WARNING "%s: packet error - packet has id " |
527 | "0x%x, but we have not\n", __func__, id); | 527 | "0x%x, but we have not\n", __func__, packet_id); |
528 | return; | 528 | return; |
529 | } | 529 | } |
530 | if (len < 4) { | 530 | if (len < 4) { |
@@ -532,16 +532,16 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len) | |||
532 | "short for ID value\n", __func__); | 532 | "short for ID value\n", __func__); |
533 | return; | 533 | return; |
534 | } | 534 | } |
535 | id = (*buf++) << 24; | 535 | packet_id = (*buf++) << 24; |
536 | id += (*buf++) << 16; | 536 | packet_id += (*buf++) << 16; |
537 | id += (*buf++) << 8; | 537 | packet_id += (*buf++) << 8; |
538 | id += (*buf++); | 538 | packet_id += (*buf++); |
539 | len -= 4; | 539 | len -= 4; |
540 | 540 | ||
541 | if (id != hc->id) { | 541 | if (packet_id != hc->id) { |
542 | printk(KERN_WARNING "%s: packet error - ID mismatch, " | 542 | printk(KERN_WARNING "%s: packet error - ID mismatch, " |
543 | "got 0x%x, we 0x%x\n", | 543 | "got 0x%x, we 0x%x\n", |
544 | __func__, id, hc->id); | 544 | __func__, packet_id, hc->id); |
545 | return; | 545 | return; |
546 | } | 546 | } |
547 | } else { | 547 | } else { |