Merge branch 'upstream'

2 files changed, 3 insertions, 2 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 0b48e294aaf..a5efc9ae010 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1113,7 +1113,8 @@ out:
 void netdev_rx_csum_fault(struct net_device *dev)
 {
         if (net_ratelimit()) {
-                printk(KERN_ERR "%s: hw csum failure.\n", dev->name);
+                printk(KERN_ERR "%s: hw csum failure.\n", 
+                        dev ? dev->name : "<unknown>");
                 dump_stack();
         }
 }
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index b7d13a4fff4..83fee37de38 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1725,7 +1725,7 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,
  * of the skb if any page alloc fails user this procedure returns  -ENOMEM
  */
 int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,
-                        int getfrag(void *from, char *to, int offset,
+                        int (*getfrag)(void *from, char *to, int offset,
                                         int len, int odd, struct sk_buff *skb),
                         void *from, int length)
 {