diff options
author | Harald Welte <laforge@gnumonks.org> | 2011-02-05 15:30:48 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2011-02-05 20:26:26 +0100 |
commit | 50d369e1a9052c23672aeccdc6972b3d1caf22c9 (patch) | |
tree | 95f54d9f80aeb3a5c45b7e6a66ac43b0ddde2f23 /openbsc/src/input | |
parent | ca17ef88f57a373fef29513273e8f24c2492c969 (diff) |
[DAHDI] update to latest e1_input changes
Diffstat (limited to 'openbsc/src/input')
-rw-r--r-- | openbsc/src/input/dahdi.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/openbsc/src/input/dahdi.c b/openbsc/src/input/dahdi.c index 2615557b2..ebdaccfba 100644 --- a/openbsc/src/input/dahdi.c +++ b/openbsc/src/input/dahdi.c @@ -353,7 +353,7 @@ void dahdi_set_bufinfo(int fd, int as_sigchan) } -static int mi_e1_setup(struct e1inp_line *line, int release_l2) +static int dahdi_e1_setup(struct e1inp_line *line, int release_l2) { int ts, ret; @@ -419,22 +419,12 @@ static int dahdi_e1_line_update(struct e1inp_line *line) { int ret; - if (!line->driver) { - /* this must be the first update */ - line->driver = &dahdi_driver; - } else { - /* this is a subsequent update */ - /* FIXME: first close all sockets */ - fprintf(stderr, "incremental line updates not supported yet\n"); - return 0; - } - if (line->driver != &dahdi_driver) return -EINVAL; init_flip_bits(); - ret = mi_e1_setup(line, 1); + ret = dahdi_e1_setup(line, 1); if (ret) return ret; @@ -446,7 +436,7 @@ static int dahdi_e1_line_update(struct e1inp_line *line) int e1inp_dahdi_init(void) { /* register the driver with the core */ - e1inp_driver_register(&dahdi_driver); + return e1inp_driver_register(&dahdi_driver); } #endif /* HAVE_DAHDI_USER_H */ |