Merge branches 'topic/fix/hda' and 'topic/fix/misc' into for-linus

[mv-sheeva.git] / drivers / net / cxgb3 / cxgb3_offload.c

diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index c5b3de1bb45625a688ee7d020e723545284f0947..265aa8a15afaed2eb5a61177917d07cd6649b476 100644 (file)
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -1018,7 +1018,7 @@ static void set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e)
 
        skb = alloc_skb(sizeof(*req), GFP_ATOMIC);
        if (!skb) {
-               printk(KERN_ERR "%s: cannot allocate skb!\n", __FUNCTION__);
+               printk(KERN_ERR "%s: cannot allocate skb!\n", __func__);
                return;
        }
        skb->priority = CPL_PRIORITY_CONTROL;
@@ -1049,14 +1049,14 @@ void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)
                return;
        if (!is_offloading(newdev)) {
                printk(KERN_WARNING "%s: Redirect to non-offload "
-                      "device ignored.\n", __FUNCTION__);
+                      "device ignored.\n", __func__);
                return;
        }
        tdev = dev2t3cdev(olddev);
        BUG_ON(!tdev);
        if (tdev != dev2t3cdev(newdev)) {
                printk(KERN_WARNING "%s: Redirect to different "
-                      "offload device ignored.\n", __FUNCTION__);
+                      "offload device ignored.\n", __func__);
                return;
        }
 
@@ -1064,7 +1064,7 @@ void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)
        e = t3_l2t_get(tdev, new->neighbour, newdev);
        if (!e) {
                printk(KERN_ERR "%s: couldn't allocate new l2t entry!\n",
-                      __FUNCTION__);
+                      __func__);
                return;
        }