[svn-commits] sruffell: linux/trunk r9444 - in /linux/trunk: drivers/dahdi/ drivers/dahdi/w...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Oct 20 07:23:23 CDT 2010
Author: sruffell
Date: Wed Oct 20 07:23:16 2010
New Revision: 9444
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9444
Log:
dahdi: Atomically set/test if channel has associated network device.
Push all tests for the DAHDI_FLAGBIT_NETDEV flag behind a
'dahdi_have_netdev' function so if CONFIG_DAHDI_NET is not defined the
compiler can just remove all the flag tests. Also, makes sure that the
bit is checked / set atomically.
(closes issue #9379)
Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Kinsey Moore <kmoore at digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks at digium.com>
Modified:
linux/trunk/drivers/dahdi/dahdi-base.c
linux/trunk/drivers/dahdi/tor2.c
linux/trunk/drivers/dahdi/wct1xxp.c
linux/trunk/drivers/dahdi/wct4xxp/base.c
linux/trunk/drivers/dahdi/wcte11xp.c
linux/trunk/drivers/dahdi/wcte12xp/base.c
linux/trunk/include/dahdi/kernel.h
Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=9444&r1=9443&r2=9444
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Wed Oct 20 07:23:16 2010
@@ -1730,7 +1730,7 @@
module_printk(KERN_NOTICE, "%s is already open!\n", ms->name);
return -EBUSY;
}
- if (!(ms->flags & DAHDI_FLAG_NETDEV)) {
+ if (!dahdi_have_netdev(ms)) {
module_printk(KERN_NOTICE, "%s is not a net device!\n", ms->name);
return -EINVAL;
}
@@ -1791,7 +1791,7 @@
return;
#endif
}
- if (!(ms->flags & DAHDI_FLAG_NETDEV)) {
+ if (!dahdi_have_netdev(ms)) {
#ifdef NEW_HDLC_INTERFACE
module_printk(KERN_NOTICE, "dahdi_net_stop: %s is not a net device!\n", ms->name);
return 0;
@@ -2067,7 +2067,7 @@
release_echocan(chan->ec_factory);
#ifdef CONFIG_DAHDI_NET
- if (chan->flags & DAHDI_FLAG_NETDEV) {
+ if (dahdi_have_netdev(chan)) {
unregister_hdlc_device(chan->hdlcnetdev->netdev);
free_netdev(chan->hdlcnetdev->netdev);
kfree(chan->hdlcnetdev);
@@ -2823,7 +2823,7 @@
if (chan && chan->sig) {
/* Make sure we're not already open, a net device, or a slave device */
- if (chan->flags & DAHDI_FLAG_NETDEV)
+ if (dahdi_have_netdev(chan))
res = -EBUSY;
else if (chan->master != chan)
res = -EBUSY;
@@ -4234,7 +4234,7 @@
}
spin_lock_irqsave(&chan->lock, flags);
#ifdef CONFIG_DAHDI_NET
- if (chan->flags & DAHDI_FLAG_NETDEV) {
+ if (dahdi_have_netdev(chan)) {
if (ztchan_to_dev(chan)->flags & IFF_UP) {
spin_unlock_irqrestore(&chan->lock, flags);
module_printk(KERN_WARNING, "Can't switch HDLC net mode on channel %s, since current interface is up\n", chan->name);
@@ -4246,7 +4246,7 @@
free_netdev(chan->hdlcnetdev->netdev);
kfree(chan->hdlcnetdev);
chan->hdlcnetdev = NULL;
- chan->flags &= ~DAHDI_FLAG_NETDEV;
+ clear_bit(DAHDI_FLAGBIT_NETDEV, &chan->flags);
}
#else
if (ch.sigtype == DAHDI_SIG_HDLCNET) {
@@ -4368,7 +4368,7 @@
res = -1;
}
if (!res)
- chan->flags |= DAHDI_FLAG_NETDEV;
+ set_bit(DAHDI_FLAGBIT_NETDEV, &chan->flags);
} else {
module_printk(KERN_NOTICE, "Unable to allocate netdev: out of memory\n");
res = -1;
@@ -4377,7 +4377,7 @@
#endif
if ((chan->sig == DAHDI_SIG_HDLCNET) &&
(chan == newmaster) &&
- !(chan->flags & DAHDI_FLAG_NETDEV))
+ !dahdi_have_netdev(chan))
module_printk(KERN_NOTICE, "Unable to register HDLC device for channel %s\n", chan->name);
if (!res) {
/* Setup default law */
@@ -6770,7 +6770,8 @@
with an infinite loop that gets broken out of upon an active condition,
otherwise keeps sleeping and looking. The part in this code got "optimized"
out in the later versions, and is put back now. */
- if (!(ms->flags & (DAHDI_FLAG_NETDEV | DAHDI_FLAG_PPP))) {
+ if (!(ms->flags & DAHDI_FLAG_PPP) ||
+ !dahdi_have_netdev(ms)) {
wake_up_interruptible(&ms->writebufq);
wake_up_interruptible(&ms->sel);
if (ms->iomask & DAHDI_IOMUX_WRITE)
@@ -6780,7 +6781,7 @@
if (ms->flags & DAHDI_FLAG_HDLC)
fasthdlc_tx_frame_nocheck(&ms->txhdlc);
#ifdef CONFIG_DAHDI_NET
- if (ms->flags & DAHDI_FLAG_NETDEV)
+ if (dahdi_have_netdev(ms))
netif_wake_queue(ztchan_to_dev(ms));
#endif
#ifdef CONFIG_DAHDI_PPP
@@ -7819,7 +7820,8 @@
module_printk(KERN_NOTICE, "EOF, len is %d\n", ms->readn[ms->inreadbuf]);
#endif
#if defined(CONFIG_DAHDI_NET) || defined(CONFIG_DAHDI_PPP)
- if (ms->flags & (DAHDI_FLAG_NETDEV | DAHDI_FLAG_PPP)) {
+ if ((ms->flags & DAHDI_FLAG_PPP) ||
+ dahdi_have_netdev(ms)) {
#ifdef CONFIG_DAHDI_NET
#endif /* CONFIG_DAHDI_NET */
/* Our network receiver logic is MUCH
@@ -7841,7 +7843,7 @@
memcpy(skb->data, ms->readbuf[ms->inreadbuf], ms->readn[ms->inreadbuf]);
skb_put(skb, ms->readn[ms->inreadbuf]);
#ifdef CONFIG_DAHDI_NET
- if (ms->flags & DAHDI_FLAG_NETDEV) {
+ if (dahdi_have_netdev(ms)) {
struct net_device_stats *stats = hdlc_stats(ms->hdlcnetdev->netdev);
stats->rx_packets++;
stats->rx_bytes += ms->readn[ms->inreadbuf];
@@ -7850,7 +7852,7 @@
} else {
#ifdef CONFIG_DAHDI_NET
- if (ms->flags & DAHDI_FLAG_NETDEV) {
+ if (dahdi_have_netdev(ms)) {
struct net_device_stats *stats = hdlc_stats(ms->hdlcnetdev->netdev);
stats->rx_dropped++;
}
@@ -7948,7 +7950,7 @@
ms->infcs = PPP_INITFCS;
#ifdef CONFIG_DAHDI_NET
- if (ms->flags & DAHDI_FLAG_NETDEV) {
+ if (dahdi_have_netdev(ms)) {
struct net_device_stats *stats = hdlc_stats(ms->hdlcnetdev->netdev);
stats->rx_errors++;
if (abort == DAHDI_EVENT_OVERRUN)
@@ -7973,7 +7975,7 @@
} else /* No place to receive -- drop on the floor */
break;
#ifdef CONFIG_DAHDI_NET
- if (skb && (ms->flags & DAHDI_FLAG_NETDEV))
+ if (skb && dahdi_have_netdev(ms))
#ifdef NEW_HDLC_INTERFACE
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
@@ -8157,7 +8159,8 @@
if (ss->inwritebuf < 0)
ss->inwritebuf = oldbuf;
- if (!(ss->flags & (DAHDI_FLAG_NETDEV | DAHDI_FLAG_PPP))) {
+ if (!(ss->flags & DAHDI_FLAG_PPP) ||
+ !dahdi_have_netdev(ss)) {
wake_up_interruptible(&ss->writebufq);
wake_up_interruptible(&ss->sel);
if ((ss->iomask & DAHDI_IOMUX_WRITE) && (res >= 0))
Modified: linux/trunk/drivers/dahdi/tor2.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/tor2.c?view=diff&rev=9444&r1=9443&r2=9444
==============================================================================
--- linux/trunk/drivers/dahdi/tor2.c (original)
+++ linux/trunk/drivers/dahdi/tor2.c Wed Oct 20 07:23:16 2010
@@ -1397,7 +1397,7 @@
/* go thru all chans, and count # open */
for (n = 0, k = 0; k < tor->tspans[i].dahdi_span.channels; k++) {
if (((tor->chans[i][k])->flags & DAHDI_FLAG_OPEN) ||
- ((tor->chans[i][k])->flags & DAHDI_FLAG_NETDEV))
+ dahdi_have_netdev(tor->chans[i][k]))
n++;
}
/* if none open, set alarm condition */
Modified: linux/trunk/drivers/dahdi/wct1xxp.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wct1xxp.c?view=diff&rev=9444&r1=9443&r2=9444
==============================================================================
--- linux/trunk/drivers/dahdi/wct1xxp.c (original)
+++ linux/trunk/drivers/dahdi/wct1xxp.c Wed Oct 20 07:23:16 2010
@@ -1072,7 +1072,7 @@
if (wc->span.lineconfig & DAHDI_CONFIG_NOTOPEN) {
for (x=0,j=0;x < wc->span.channels;x++)
if ((wc->chans[x]->flags & DAHDI_FLAG_OPEN) ||
- (wc->chans[x]->flags & DAHDI_FLAG_NETDEV))
+ dahdi_have_netdev(wc->chans[x]))
j++;
if (!j)
alarms |= DAHDI_ALARM_NOTOPEN;
Modified: linux/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=9444&r1=9443&r2=9444
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Wed Oct 20 07:23:16 2010
@@ -3158,7 +3158,7 @@
if (ts->span.lineconfig & DAHDI_CONFIG_NOTOPEN) {
for (x=0,j=0;x < ts->span.channels;x++)
if ((ts->span.chans[x]->flags & DAHDI_FLAG_OPEN) ||
- (ts->span.chans[x]->flags & DAHDI_FLAG_NETDEV))
+ dahdi_have_netdev(ts->span.chans[x]))
j++;
if (!j)
alarms |= DAHDI_ALARM_NOTOPEN;
Modified: linux/trunk/drivers/dahdi/wcte11xp.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte11xp.c?view=diff&rev=9444&r1=9443&r2=9444
==============================================================================
--- linux/trunk/drivers/dahdi/wcte11xp.c (original)
+++ linux/trunk/drivers/dahdi/wcte11xp.c Wed Oct 20 07:23:16 2010
@@ -1247,7 +1247,7 @@
if (wc->span.lineconfig & DAHDI_CONFIG_NOTOPEN) {
for (x=0,j=0;x < wc->span.channels;x++)
if ((wc->span.chans[x]->flags & DAHDI_FLAG_OPEN) ||
- (wc->span.chans[x]->flags & DAHDI_FLAG_NETDEV))
+ dahdi_have_netdev(wc->span.chans[x]))
j++;
if (!j)
alarms |= DAHDI_ALARM_NOTOPEN;
Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=9444&r1=9443&r2=9444
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Wed Oct 20 07:23:16 2010
@@ -1723,7 +1723,7 @@
if (wc->span.lineconfig & DAHDI_CONFIG_NOTOPEN) {
for (x=0,j=0;x < wc->span.channels;x++)
if ((wc->span.chans[x]->flags & DAHDI_FLAG_OPEN) ||
- (wc->span.chans[x]->flags & DAHDI_FLAG_NETDEV))
+ dahdi_have_netdev(wc->span.chans[x]))
j++;
if (!j)
alarms |= DAHDI_ALARM_NOTOPEN;
Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=9444&r1=9443&r2=9444
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Wed Oct 20 07:23:16 2010
@@ -692,7 +692,9 @@
DAHDI_FLAGBIT_MFDECODE = 3, /*!< Channel supports native MFr2 decode */
DAHDI_FLAGBIT_ECHOCANCEL= 4, /*!< Channel supports native echo cancellation */
DAHDI_FLAGBIT_HDLC = 5, /*!< Perform HDLC */
+#ifdef CONFIG_DAHDI_NET
DAHDI_FLAGBIT_NETDEV = 6, /*!< Send to network */
+#endif
DAHDI_FLAGBIT_CLEAR = 8, /*!< Clear channel */
DAHDI_FLAGBIT_AUDIO = 9, /*!< Audio mode channel */
DAHDI_FLAGBIT_OPEN = 10, /*!< Channel is open */
@@ -708,6 +710,20 @@
DAHDI_FLAGBIT_HDLC56 = 20, /*!< Sets the given channel (if in HDLC mode) to use 56K HDLC instead of 64K */
};
+#ifdef CONFIG_DAHDI_NET
+/**
+ * have_netdev() - Return true if a channel has an associated network device.
+ * @chan: Then channel to check.
+ *
+ */
+static inline int dahdi_have_netdev(const struct dahdi_chan *chan)
+{
+ return test_bit(DAHDI_FLAGBIT_NETDEV, &chan->flags);
+}
+#else
+static inline int dahdi_have_netdev(const struct dahdi_chan *chan) { return 0; }
+#endif
+
struct dahdi_count {
__u32 fe; /*!< Framing error counter */
__u32 cv; /*!< Coding violations counter */
@@ -740,7 +756,7 @@
#define DAHDI_FLAG_ECHOCANCEL DAHDI_FLAG(ECHOCANCEL)
#define DAHDI_FLAG_HDLC DAHDI_FLAG(HDLC)
-#define DAHDI_FLAG_NETDEV DAHDI_FLAG(NETDEV)
+/* #define DAHDI_FLAG_NETDEV DAHDI_FLAG(NETDEV) */
#define DAHDI_FLAG_CLEAR DAHDI_FLAG(CLEAR)
#define DAHDI_FLAG_AUDIO DAHDI_FLAG(AUDIO)
More information about the svn-commits
mailing list