diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 20:24:45 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 20:24:45 (GMT) |
| commit | b1086eef813ecee09bd6b8ae364acf0fad065cba (patch) | |
| tree | bc723bbdfc2898252e3fd8e14320d7fac58dca4b /net/core | |
| parent | 003a20c81ec278595820d3829b544e90919f6f61 (diff) | |
| parent | 49d7bc64283970ee83d2c954d04ba00d04e5943d (diff) | |
| download | linux-b1086eef813ecee09bd6b8ae364acf0fad065cba.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 3 | ||||
| -rw-r--r-- | net/core/skbuff.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 94e642e..1a59f21 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 b7d13a4..83fee37 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) { |