diff options
| -rw-r--r-- | drivers/dahdi/dahdi_dummy.c | 4 | ||||
| -rw-r--r-- | drivers/dahdi/dahdi_dynamic_eth.c | 10 | ||||
| -rw-r--r-- | drivers/dahdi/dahdi_transcode.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/dahdi/dahdi_dummy.c b/drivers/dahdi/dahdi_dummy.c index 7272fd8..8e9da8a 100644 --- a/drivers/dahdi/dahdi_dummy.c +++ b/drivers/dahdi/dahdi_dummy.c @@ -223,9 +223,9 @@ static void ztdummy_timer(unsigned long param) static int ztdummy_initialize(struct ztdummy *ztd) { /* DAHDI stuff */ - sprintf(ztd->span.name, "ZTDUMMY/1"); + sprintf(ztd->span.name, "DAHDI_DUMMY/1"); snprintf(ztd->span.desc, sizeof(ztd->span.desc) - 1, "%s (source: " CLOCK_SRC ") %d", ztd->span.name, 1); - sprintf(ztd->chan.name, "ZTDUMMY/%d/%d", 1, 0); + sprintf(ztd->chan.name, "DAHDI_DUMMY/%d/%d", 1, 0); dahdi_copy_string(ztd->span.devicetype, "DAHDI Dummy Timing Driver", sizeof(ztd->span.devicetype)); ztd->chan.chanpos = 1; ztd->span.chans = &ztd->chan; diff --git a/drivers/dahdi/dahdi_dynamic_eth.c b/drivers/dahdi/dahdi_dynamic_eth.c index a797d84..3292d1b 100644 --- a/drivers/dahdi/dahdi_dynamic_eth.c +++ b/drivers/dahdi/dahdi_dynamic_eth.c @@ -36,7 +36,7 @@ #include <dahdi/kernel.h> #include <dahdi/user.h> -#define ETH_P_ZTDETH 0xd00d +#define ETH_P_DAHDI_DETH 0xd00d struct ztdeth_header { unsigned short subaddr; @@ -170,7 +170,7 @@ static int ztdeth_transmit(void *pvt, unsigned char *msg, int msglen) zh->subaddr = subaddr; /* Setup protocol and such */ - skb->protocol = __constant_htons(ETH_P_ZTDETH); + skb->protocol = __constant_htons(ETH_P_DAHDI_DETH); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) skb_set_network_header(skb, 0); #else @@ -178,10 +178,10 @@ static int ztdeth_transmit(void *pvt, unsigned char *msg, int msglen) #endif skb->dev = dev; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) - dev_hard_header(skb, dev, ETH_P_ZTDETH, addr, dev->dev_addr, skb->len); + dev_hard_header(skb, dev, ETH_P_DAHDI_DETH, addr, dev->dev_addr, skb->len); #else if (dev->hard_header) - dev->hard_header(skb, dev, ETH_P_ZTDETH, addr, dev->dev_addr, skb->len); + dev->hard_header(skb, dev, ETH_P_DAHDI_DETH, addr, dev->dev_addr, skb->len); #endif skb_queue_tail(&skbs, skb); } @@ -204,7 +204,7 @@ static int ztdeth_flush(void) } static struct packet_type ztdeth_ptype = { - type: __constant_htons(ETH_P_ZTDETH), /* Protocol */ + type: __constant_htons(ETH_P_DAHDI_DETH), /* Protocol */ dev: NULL, /* Device (NULL = wildcard) */ func: ztdeth_rcv, /* Receiver */ }; diff --git a/drivers/dahdi/dahdi_transcode.c b/drivers/dahdi/dahdi_transcode.c index d47beda..df11dce 100644 --- a/drivers/dahdi/dahdi_transcode.c +++ b/drivers/dahdi/dahdi_transcode.c @@ -156,7 +156,7 @@ int dahdi_transcoder_unregister(struct dahdi_transcoder *tc) int dahdi_transcoder_alert(struct dahdi_transcoder_channel *ztc) { if (debug) - printk("ZT Transcoder Alert!\n"); + printk("DAHDI Transcoder Alert!\n"); if (ztc->tch) ztc->tch->status &= ~DAHDI_TC_FLAG_BUSY; wake_up_interruptible(&ztc->ready); @@ -328,7 +328,7 @@ static int dahdi_tc_ioctl(struct inode *inode, struct file *file, unsigned int c return -EFAULT; if (debug) - printk("ZT Transcode ioctl op = %d!\n", op); + printk("DAHDI Transcode ioctl op = %d!\n", op); switch(op) { case DAHDI_TCOP_GETINFO: |