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

dahdi: Fix compilation error when CONFIG_DAHDI_NET is defined.

Browse Source 
Kernel interface for network devices changed. This is the patch from issue
plus a few trivial checkpatch.pl formatting changes (minus the >80 column
warnings).

(closes issue #17857)
Reported by: msink
Patches:
      dahdi_net-v2.patch uploaded by msink (license 1103)

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9247 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2010-09-01 15:46:26 +00:00
parent 892fe4b325
commit e88554710f
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/dahdi/dahdi-base.c
View File

@ -1665,6 +1665,13 @@ static inline void print_debug_writebuf(struct dahdi_chan* ss, struct sk_buff *s
#endif #endif
#ifdef CONFIG_DAHDI_NET #ifdef CONFIG_DAHDI_NET
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
static inline struct net_device_stats *hdlc_stats(struct net_device *dev)
{
return &dev->stats;
}
#endif
#ifdef NEW_HDLC_INTERFACE #ifdef NEW_HDLC_INTERFACE
static int dahdi_net_open(struct net_device *dev) static int dahdi_net_open(struct net_device *dev)
{ {
@ -4134,6 +4141,15 @@ static void recalc_slaves(struct dahdi_chan *chan)
#endif #endif
} }
#if defined(CONFIG_DAHDI_NET) && defined(HAVE_NET_DEVICE_OPS)
static const struct net_device_ops dahdi_netdev_ops = {
.ndo_open = dahdi_net_open,
.ndo_stop = dahdi_net_stop,
.ndo_do_ioctl = dahdi_net_ioctl,
.ndo_start_xmit = dahdi_xmit,
};
#endif
static int dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long data) static int dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long data)
{ {
/* I/O CTL's for control interface */ /* I/O CTL's for control interface */
@ -4382,9 +4398,13 @@ static int dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long da
#endif #endif
chans[ch.chan]->hdlcnetdev->netdev->irq = chans[ch.chan]->span->irq; chans[ch.chan]->hdlcnetdev->netdev->irq = chans[ch.chan]->span->irq;
chans[ch.chan]->hdlcnetdev->netdev->tx_queue_len = 50; chans[ch.chan]->hdlcnetdev->netdev->tx_queue_len = 50;
#ifdef HAVE_NET_DEVICE_OPS
chans[ch.chan]->hdlcnetdev->netdev->netdev_ops = &dahdi_netdev_ops;
#else
chans[ch.chan]->hdlcnetdev->netdev->do_ioctl = dahdi_net_ioctl; chans[ch.chan]->hdlcnetdev->netdev->do_ioctl = dahdi_net_ioctl;
chans[ch.chan]->hdlcnetdev->netdev->open = dahdi_net_open; chans[ch.chan]->hdlcnetdev->netdev->open = dahdi_net_open;
chans[ch.chan]->hdlcnetdev->netdev->stop = dahdi_net_stop; chans[ch.chan]->hdlcnetdev->netdev->stop = dahdi_net_stop;
#endif
dev_to_hdlc(chans[ch.chan]->hdlcnetdev->netdev)->attach = dahdi_net_attach; dev_to_hdlc(chans[ch.chan]->hdlcnetdev->netdev)->attach = dahdi_net_attach;
dev_to_hdlc(chans[ch.chan]->hdlcnetdev->netdev)->xmit = dahdi_xmit; dev_to_hdlc(chans[ch.chan]->hdlcnetdev->netdev)->xmit = dahdi_xmit;
spin_unlock_irqrestore(&chans[ch.chan]->lock, flags); spin_unlock_irqrestore(&chans[ch.chan]->lock, flags);
@ -7636,8 +7656,11 @@ static inline void __putbuf_chunk(struct dahdi_chan *ss, unsigned char *rxb, int
#ifdef CONFIG_DAHDI_PPP #ifdef CONFIG_DAHDI_PPP
if (!ms->do_ppp_error) if (!ms->do_ppp_error)
#endif #endif
skb = dev_alloc_skb(ms->readn[ms->inreadbuf]); skb = dev_alloc_skb(ms->readn[ms->inreadbuf] + 2);
if (skb) { if (skb) {
unsigned char cisco_addr = *(ms->readbuf[ms->inreadbuf]);
if (cisco_addr != 0x0f && cisco_addr != 0x8f)
skb_reserve(skb, 2);
/* XXX Get rid of this memcpy XXX */ /* XXX Get rid of this memcpy XXX */
memcpy(skb->data, ms->readbuf[ms->inreadbuf], ms->readn[ms->inreadbuf]); memcpy(skb->data, ms->readbuf[ms->inreadbuf], ms->readn[ms->inreadbuf]);
skb_put(skb, ms->readn[ms->inreadbuf]); skb_put(skb, ms->readn[ms->inreadbuf]);