diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-05 23:47:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-05 23:47:47 -0500 |
commit | 0dc47877a3de00ceadea0005189656ae8dc52669 (patch) | |
tree | 7440a87385fe318cb42f0ae161be195f5e967d82 /net/irda/irlan/irlan_eth.c | |
parent | 6387c4bed539539b05fa773cf2ff26529dc3074c (diff) |
net: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/irlan/irlan_eth.c')
-rw-r--r-- | net/irda/irlan/irlan_eth.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c index 1ab91f787cc1..7a6b14ab1e7f 100644 --- a/net/irda/irlan/irlan_eth.c +++ b/net/irda/irlan/irlan_eth.c | |||
@@ -103,7 +103,7 @@ static int irlan_eth_open(struct net_device *dev) | |||
103 | { | 103 | { |
104 | struct irlan_cb *self = netdev_priv(dev); | 104 | struct irlan_cb *self = netdev_priv(dev); |
105 | 105 | ||
106 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); | 106 | IRDA_DEBUG(2, "%s()\n", __func__ ); |
107 | 107 | ||
108 | /* Ready to play! */ | 108 | /* Ready to play! */ |
109 | netif_stop_queue(dev); /* Wait until data link is ready */ | 109 | netif_stop_queue(dev); /* Wait until data link is ready */ |
@@ -130,7 +130,7 @@ static int irlan_eth_close(struct net_device *dev) | |||
130 | { | 130 | { |
131 | struct irlan_cb *self = netdev_priv(dev); | 131 | struct irlan_cb *self = netdev_priv(dev); |
132 | 132 | ||
133 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); | 133 | IRDA_DEBUG(2, "%s()\n", __func__ ); |
134 | 134 | ||
135 | /* Stop device */ | 135 | /* Stop device */ |
136 | netif_stop_queue(dev); | 136 | netif_stop_queue(dev); |
@@ -221,7 +221,7 @@ int irlan_eth_receive(void *instance, void *sap, struct sk_buff *skb) | |||
221 | } | 221 | } |
222 | if (skb->len < ETH_HLEN) { | 222 | if (skb->len < ETH_HLEN) { |
223 | IRDA_DEBUG(0, "%s() : IrLAN frame too short (%d)\n", | 223 | IRDA_DEBUG(0, "%s() : IrLAN frame too short (%d)\n", |
224 | __FUNCTION__, skb->len); | 224 | __func__, skb->len); |
225 | ++self->stats.rx_dropped; | 225 | ++self->stats.rx_dropped; |
226 | dev_kfree_skb(skb); | 226 | dev_kfree_skb(skb); |
227 | return 0; | 227 | return 0; |
@@ -270,7 +270,7 @@ void irlan_eth_flow_indication(void *instance, void *sap, LOCAL_FLOW flow) | |||
270 | 270 | ||
271 | IRDA_ASSERT(dev != NULL, return;); | 271 | IRDA_ASSERT(dev != NULL, return;); |
272 | 272 | ||
273 | IRDA_DEBUG(0, "%s() : flow %s ; running %d\n", __FUNCTION__, | 273 | IRDA_DEBUG(0, "%s() : flow %s ; running %d\n", __func__, |
274 | flow == FLOW_STOP ? "FLOW_STOP" : "FLOW_START", | 274 | flow == FLOW_STOP ? "FLOW_STOP" : "FLOW_START", |
275 | netif_running(dev)); | 275 | netif_running(dev)); |
276 | 276 | ||
@@ -332,11 +332,11 @@ static void irlan_eth_set_multicast_list(struct net_device *dev) | |||
332 | { | 332 | { |
333 | struct irlan_cb *self = netdev_priv(dev); | 333 | struct irlan_cb *self = netdev_priv(dev); |
334 | 334 | ||
335 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); | 335 | IRDA_DEBUG(2, "%s()\n", __func__ ); |
336 | 336 | ||
337 | /* Check if data channel has been connected yet */ | 337 | /* Check if data channel has been connected yet */ |
338 | if (self->client.state != IRLAN_DATA) { | 338 | if (self->client.state != IRLAN_DATA) { |
339 | IRDA_DEBUG(1, "%s(), delaying!\n", __FUNCTION__ ); | 339 | IRDA_DEBUG(1, "%s(), delaying!\n", __func__ ); |
340 | return; | 340 | return; |
341 | } | 341 | } |
342 | 342 | ||
@@ -346,20 +346,20 @@ static void irlan_eth_set_multicast_list(struct net_device *dev) | |||
346 | } | 346 | } |
347 | else if ((dev->flags & IFF_ALLMULTI) || dev->mc_count > HW_MAX_ADDRS) { | 347 | else if ((dev->flags & IFF_ALLMULTI) || dev->mc_count > HW_MAX_ADDRS) { |
348 | /* Disable promiscuous mode, use normal mode. */ | 348 | /* Disable promiscuous mode, use normal mode. */ |
349 | IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __FUNCTION__ ); | 349 | IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __func__ ); |
350 | /* hardware_set_filter(NULL); */ | 350 | /* hardware_set_filter(NULL); */ |
351 | 351 | ||
352 | irlan_set_multicast_filter(self, TRUE); | 352 | irlan_set_multicast_filter(self, TRUE); |
353 | } | 353 | } |
354 | else if (dev->mc_count) { | 354 | else if (dev->mc_count) { |
355 | IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __FUNCTION__ ); | 355 | IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __func__ ); |
356 | /* Walk the address list, and load the filter */ | 356 | /* Walk the address list, and load the filter */ |
357 | /* hardware_set_filter(dev->mc_list); */ | 357 | /* hardware_set_filter(dev->mc_list); */ |
358 | 358 | ||
359 | irlan_set_multicast_filter(self, TRUE); | 359 | irlan_set_multicast_filter(self, TRUE); |
360 | } | 360 | } |
361 | else { | 361 | else { |
362 | IRDA_DEBUG(4, "%s(), Clearing multicast filter\n", __FUNCTION__ ); | 362 | IRDA_DEBUG(4, "%s(), Clearing multicast filter\n", __func__ ); |
363 | irlan_set_multicast_filter(self, FALSE); | 363 | irlan_set_multicast_filter(self, FALSE); |
364 | } | 364 | } |
365 | 365 | ||