Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26: (1090 commits)
  [NET]: Fix and allocate less memory for ->priv'less netdevices
  [IPV6]: Fix dangling references on error in fib6_add().
  [NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found
  [PKT_SCHED]: Fix datalen check in tcf_simp_init().
  [INET]: Uninline the __inet_inherit_port call.
  [INET]: Drop the inet_inherit_port() call.
  SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked.
  [netdrvr] forcedeth: internal simplifications; changelog removal
  phylib: factor out get_phy_id from within get_phy_device
  PHY: add BCM5464 support to broadcom PHY driver
  cxgb3: Fix __must_check warning with dev_dbg.
  tc35815: Statistics cleanup
  natsemi: fix MMIO for PPC 44x platforms
  [TIPC]: Cleanup of TIPC reference table code
  [TIPC]: Optimized initialization of TIPC reference table
  [TIPC]: Remove inlining of reference table locking routines
  e1000: convert uint16_t style integers to u16
  ixgb: convert uint16_t style integers to u16
  sb1000.c: make const arrays static
  sb1000.c: stop inlining largish static functions
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/net/irda/wrapper.c b/net/irda/wrapper.c
index c246983308b8..fd0995b1323a 100644
--- a/net/irda/wrapper.c
+++ b/net/irda/wrapper.c
@@ -106,16 +106,16 @@ int async_wrap_skb(struct sk_buff *skb, __u8 *tx_buff, int buffsize)
                  * Nothing to worry about, but we set the default number of
                  * BOF's
                  */
-                IRDA_DEBUG(1, "%s(), wrong magic in skb!\n", __FUNCTION__);
+                IRDA_DEBUG(1, "%s(), wrong magic in skb!\n", __func__);
                 xbofs = 10;
         } else
                 xbofs = cb->xbofs + cb->xbofs_delay;
 
-        IRDA_DEBUG(4, "%s(), xbofs=%d\n", __FUNCTION__, xbofs);
+        IRDA_DEBUG(4, "%s(), xbofs=%d\n", __func__, xbofs);
 
         /* Check that we never use more than 115 + 48 xbofs */
         if (xbofs > 163) {
-                IRDA_DEBUG(0, "%s(), too many xbofs (%d)\n", __FUNCTION__,
+                IRDA_DEBUG(0, "%s(), too many xbofs (%d)\n", __func__,
                            xbofs);
                 xbofs = 163;
         }
@@ -135,7 +135,7 @@ int async_wrap_skb(struct sk_buff *skb, __u8 *tx_buff, int buffsize)
                  */
                 if(n >= (buffsize-5)) {
                         IRDA_ERROR("%s(), tx buffer overflow (n=%d)\n",
-                                   __FUNCTION__, n);
+                                   __func__, n);
                         return n;
                 }
 
@@ -287,7 +287,7 @@ async_unwrap_bof(struct net_device *dev,
                 /* Not supposed to happen, the previous frame is not
                  * finished - Jean II */
                 IRDA_DEBUG(1, "%s(), Discarding incomplete frame\n",
-                           __FUNCTION__);
+                           __func__);
                 stats->rx_errors++;
                 stats->rx_missed_errors++;
                 irda_device_set_media_busy(dev, TRUE);
@@ -360,7 +360,7 @@ async_unwrap_eof(struct net_device *dev,
                         /* Wrong CRC, discard frame!  */
                         irda_device_set_media_busy(dev, TRUE);
 
-                        IRDA_DEBUG(1, "%s(), crc error\n", __FUNCTION__);
+                        IRDA_DEBUG(1, "%s(), crc error\n", __func__);
                         stats->rx_errors++;
                         stats->rx_crc_errors++;
                 }
@@ -386,7 +386,7 @@ async_unwrap_ce(struct net_device *dev,
                 break;
 
         case LINK_ESCAPE:
-                IRDA_WARNING("%s: state not defined\n", __FUNCTION__);
+                IRDA_WARNING("%s: state not defined\n", __func__);
                 break;
 
         case BEGIN_FRAME:
@@ -421,7 +421,7 @@ async_unwrap_other(struct net_device *dev,
 #endif
                 } else {
                         IRDA_DEBUG(1, "%s(), Rx buffer overflow, aborting\n",
-                                   __FUNCTION__);
+                                   __func__);
                         rx_buff->state = OUTSIDE_FRAME;
                 }
                 break;
@@ -440,7 +440,7 @@ async_unwrap_other(struct net_device *dev,
                         rx_buff->state = INSIDE_FRAME;
                 } else {
                         IRDA_DEBUG(1, "%s(), Rx buffer overflow, aborting\n",
-                                   __FUNCTION__);
+                                   __func__);
                         rx_buff->state = OUTSIDE_FRAME;
                 }
                 break;