FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wcte13xp: Do not reconfigure framer when span lineconfig is not changed.

Browse Source 
If dahdi_span_ops.spanconfig is called multiple times in a row (like when
running dahdi_cfg; dahdi_cfg ) the tx signaling bits would go through a spurious
state that some far side devices would respond to.

Now, if the dahdi_span_ops.spanconfig callback is called, and the configuration
matches the existing configuration, we will not touch the framer.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
This commit is contained in:
Shaun Ruffell 2014-07-10 13:26:14 -05:00 committed by Russ Meyerriecks
parent a1ff3cb0c0
commit 8210fea5b3
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/dahdi/wcte13xp-base.c
View File

@ -110,6 +110,7 @@ struct t13x {
struct vpm450m *vpm; struct vpm450m *vpm;
struct mutex lock; struct mutex lock;
struct wcxb xb; struct wcxb xb;
u32 lineconfig_fingerprint;
}; };
static void te13x_handle_transmit(struct wcxb *xb, void *vfp); static void te13x_handle_transmit(struct wcxb *xb, void *vfp);
@ -1675,12 +1676,37 @@ static void t13x_chan_set_sigcap(struct dahdi_span *span, int x)
} }
} }
static bool t13x_lineconfig_changed(struct t13x *wc,
const struct dahdi_lineconfig *lc)
{
unsigned long flags;
bool result;
u32 crc = crc32(~0, lc, sizeof(*lc));
spin_lock_irqsave(&wc->reglock, flags);
result = (crc != wc->lineconfig_fingerprint);
spin_unlock_irqrestore(&wc->reglock, flags);
return result;
}
static void t13x_save_lineconfig(struct t13x *wc,
const struct dahdi_lineconfig *lc)
{
unsigned long flags;
u32 crc = crc32(~0, lc, sizeof(*lc));
spin_lock_irqsave(&wc->reglock, flags);
wc->lineconfig_fingerprint = crc;
spin_unlock_irqrestore(&wc->reglock, flags);
}
static int static int
t13x_spanconfig(struct file *file, struct dahdi_span *span, t13x_spanconfig(struct file *file, struct dahdi_span *span,
struct dahdi_lineconfig *lc) struct dahdi_lineconfig *lc)
{ {
struct t13x *wc = container_of(span, struct t13x, span); struct t13x *wc = container_of(span, struct t13x, span);
int i; int i;
int res = 0;
if (file->f_flags & O_NONBLOCK) if (file->f_flags & O_NONBLOCK)
return -EAGAIN; return -EAGAIN;
@ -1693,10 +1719,13 @@ t13x_spanconfig(struct file *file, struct dahdi_span *span,
t13x_chan_set_sigcap(span, i); t13x_chan_set_sigcap(span, i);
/* If already running, apply changes immediately */ /* If already running, apply changes immediately */
if (test_bit(DAHDI_FLAGBIT_RUNNING, &span->flags)) if (test_bit(DAHDI_FLAGBIT_RUNNING, &span->flags) &&
return t13x_startup(file, span); t13x_lineconfig_changed(wc, lc)) {
res = t13x_startup(file, span);
return 0; if (!res)
t13x_save_lineconfig(wc, lc);
}
return res;
} }
/** /**