aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/i4l/isdn_ppp.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-28 05:14:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:34 -0400
commit156f1ed640170d70c9fc8e5f6f797ea1f2a1653b (patch)
tree4709685cf46fce1ef552ccbee6d30f5073f99216 /drivers/isdn/i4l/isdn_ppp.c
parentdd58c0dd30ac761837b1d0d8cc434c7ec7b2df68 (diff)
isdn: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: Karsten Keil <kkeil@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/isdn/i4l/isdn_ppp.c')
-rw-r--r--drivers/isdn/i4l/isdn_ppp.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 9f5fe372f83..127cfdad68e 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -110,7 +110,7 @@ isdn_ppp_free(isdn_net_local * lp)
110 110
111 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) { 111 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
112 printk(KERN_ERR "%s: ppp_slot(%d) out of range\n", 112 printk(KERN_ERR "%s: ppp_slot(%d) out of range\n",
113 __FUNCTION__, lp->ppp_slot); 113 __func__, lp->ppp_slot);
114 return 0; 114 return 0;
115 } 115 }
116 116
@@ -127,7 +127,7 @@ isdn_ppp_free(isdn_net_local * lp)
127#endif /* CONFIG_ISDN_MPP */ 127#endif /* CONFIG_ISDN_MPP */
128 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) { 128 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
129 printk(KERN_ERR "%s: ppp_slot(%d) now invalid\n", 129 printk(KERN_ERR "%s: ppp_slot(%d) now invalid\n",
130 __FUNCTION__, lp->ppp_slot); 130 __func__, lp->ppp_slot);
131 return 0; 131 return 0;
132 } 132 }
133 is = ippp_table[lp->ppp_slot]; 133 is = ippp_table[lp->ppp_slot];
@@ -226,7 +226,7 @@ isdn_ppp_wakeup_daemon(isdn_net_local * lp)
226{ 226{
227 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) { 227 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
228 printk(KERN_ERR "%s: ppp_slot(%d) out of range\n", 228 printk(KERN_ERR "%s: ppp_slot(%d) out of range\n",
229 __FUNCTION__, lp->ppp_slot); 229 __func__, lp->ppp_slot);
230 return; 230 return;
231 } 231 }
232 ippp_table[lp->ppp_slot]->state = IPPP_OPEN | IPPP_CONNECT | IPPP_NOBLOCK; 232 ippp_table[lp->ppp_slot]->state = IPPP_OPEN | IPPP_CONNECT | IPPP_NOBLOCK;
@@ -245,7 +245,7 @@ isdn_ppp_closewait(int slot)
245 245
246 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 246 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
247 printk(KERN_ERR "%s: slot(%d) out of range\n", 247 printk(KERN_ERR "%s: slot(%d) out of range\n",
248 __FUNCTION__, slot); 248 __func__, slot);
249 return 0; 249 return 0;
250 } 250 }
251 is = ippp_table[slot]; 251 is = ippp_table[slot];
@@ -343,7 +343,7 @@ isdn_ppp_release(int min, struct file *file)
343 is = file->private_data; 343 is = file->private_data;
344 344
345 if (!is) { 345 if (!is) {
346 printk(KERN_ERR "%s: no file->private_data\n", __FUNCTION__); 346 printk(KERN_ERR "%s: no file->private_data\n", __func__);
347 return; 347 return;
348 } 348 }
349 if (is->debug & 0x1) 349 if (is->debug & 0x1)
@@ -353,7 +353,7 @@ isdn_ppp_release(int min, struct file *file)
353 isdn_net_dev *p = is->lp->netdev; 353 isdn_net_dev *p = is->lp->netdev;
354 354
355 if (!p) { 355 if (!p) {
356 printk(KERN_ERR "%s: no lp->netdev\n", __FUNCTION__); 356 printk(KERN_ERR "%s: no lp->netdev\n", __func__);
357 return; 357 return;
358 } 358 }
359 is->state &= ~IPPP_CONNECT; /* -> effect: no call of wakeup */ 359 is->state &= ~IPPP_CONNECT; /* -> effect: no call of wakeup */
@@ -1080,7 +1080,7 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff
1080 printk(KERN_DEBUG "isdn_ppp: VJC_UNCOMP\n"); 1080 printk(KERN_DEBUG "isdn_ppp: VJC_UNCOMP\n");
1081 if (net_dev->local->ppp_slot < 0) { 1081 if (net_dev->local->ppp_slot < 0) {
1082 printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n", 1082 printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n",
1083 __FUNCTION__, net_dev->local->ppp_slot); 1083 __func__, net_dev->local->ppp_slot);
1084 goto drop_packet; 1084 goto drop_packet;
1085 } 1085 }
1086 if (slhc_remember(ippp_table[net_dev->local->ppp_slot]->slcomp, skb->data, skb->len) <= 0) { 1086 if (slhc_remember(ippp_table[net_dev->local->ppp_slot]->slcomp, skb->data, skb->len) <= 0) {
@@ -1107,7 +1107,7 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff
1107 skb_old->len); 1107 skb_old->len);
1108 if (net_dev->local->ppp_slot < 0) { 1108 if (net_dev->local->ppp_slot < 0) {
1109 printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n", 1109 printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n",
1110 __FUNCTION__, net_dev->local->ppp_slot); 1110 __func__, net_dev->local->ppp_slot);
1111 goto drop_packet; 1111 goto drop_packet;
1112 } 1112 }
1113 pkt_len = slhc_uncompress(ippp_table[net_dev->local->ppp_slot]->slcomp, 1113 pkt_len = slhc_uncompress(ippp_table[net_dev->local->ppp_slot]->slcomp,
@@ -1553,7 +1553,7 @@ static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to )
1553 1553
1554 if (lp->ppp_slot < 0) { 1554 if (lp->ppp_slot < 0) {
1555 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", 1555 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
1556 __FUNCTION__, lp->ppp_slot); 1556 __func__, lp->ppp_slot);
1557 return(-EINVAL); 1557 return(-EINVAL);
1558 } 1558 }
1559 1559
@@ -1604,7 +1604,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
1604 slot = lp->ppp_slot; 1604 slot = lp->ppp_slot;
1605 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 1605 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
1606 printk(KERN_ERR "%s: lp->ppp_slot(%d)\n", 1606 printk(KERN_ERR "%s: lp->ppp_slot(%d)\n",
1607 __FUNCTION__, lp->ppp_slot); 1607 __func__, lp->ppp_slot);
1608 stats->frame_drops++; 1608 stats->frame_drops++;
1609 dev_kfree_skb(skb); 1609 dev_kfree_skb(skb);
1610 spin_unlock_irqrestore(&mp->lock, flags); 1610 spin_unlock_irqrestore(&mp->lock, flags);
@@ -1641,7 +1641,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
1641 slot = lpq->ppp_slot; 1641 slot = lpq->ppp_slot;
1642 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 1642 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
1643 printk(KERN_ERR "%s: lpq->ppp_slot(%d)\n", 1643 printk(KERN_ERR "%s: lpq->ppp_slot(%d)\n",
1644 __FUNCTION__, lpq->ppp_slot); 1644 __func__, lpq->ppp_slot);
1645 } else { 1645 } else {
1646 u32 lls = ippp_table[slot]->last_link_seqno; 1646 u32 lls = ippp_table[slot]->last_link_seqno;
1647 if (MP_LT(lls, minseq)) 1647 if (MP_LT(lls, minseq))
@@ -1875,7 +1875,7 @@ void isdn_ppp_mp_reassembly( isdn_net_dev * net_dev, isdn_net_local * lp,
1875 1875
1876 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) { 1876 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
1877 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", 1877 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
1878 __FUNCTION__, lp->ppp_slot); 1878 __func__, lp->ppp_slot);
1879 return; 1879 return;
1880 } 1880 }
1881 if( MP_FLAGS(from) == (MP_BEGIN_FRAG | MP_END_FRAG) ) { 1881 if( MP_FLAGS(from) == (MP_BEGIN_FRAG | MP_END_FRAG) ) {
@@ -2655,7 +2655,7 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp,
2655 lp->ppp_slot); 2655 lp->ppp_slot);
2656 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) { 2656 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
2657 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", 2657 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
2658 __FUNCTION__, lp->ppp_slot); 2658 __func__, lp->ppp_slot);
2659 return; 2659 return;
2660 } 2660 }
2661 is = ippp_table[lp->ppp_slot]; 2661 is = ippp_table[lp->ppp_slot];
@@ -2665,7 +2665,7 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp,
2665 int slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot; 2665 int slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot;
2666 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 2666 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
2667 printk(KERN_ERR "%s: slot(%d) out of range\n", 2667 printk(KERN_ERR "%s: slot(%d) out of range\n",
2668 __FUNCTION__, slot); 2668 __func__, slot);
2669 return; 2669 return;
2670 } 2670 }
2671 mis = ippp_table[slot]; 2671 mis = ippp_table[slot];
@@ -2829,7 +2829,7 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct
2829 return; 2829 return;
2830 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 2830 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
2831 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", 2831 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
2832 __FUNCTION__, slot); 2832 __func__, slot);
2833 return; 2833 return;
2834 } 2834 }
2835 is = ippp_table[slot]; 2835 is = ippp_table[slot];
@@ -2852,7 +2852,7 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct
2852 slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot; 2852 slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot;
2853 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 2853 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
2854 printk(KERN_ERR "%s: slot(%d) out of range\n", 2854 printk(KERN_ERR "%s: slot(%d) out of range\n",
2855 __FUNCTION__, slot); 2855 __func__, slot);
2856 return; 2856 return;
2857 } 2857 }
2858 mis = ippp_table[slot]; 2858 mis = ippp_table[slot];