diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-09 20:49:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-09 20:49:13 +0200 |
| commit | a4657141091c2f975fa35ac1ad28fffdd756091e (patch) | |
| tree | d284f416d2ffb21d5cb3a74843a9ab976ec32193 /include | |
| parent | Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kerne... (diff) | |
| parent | [NET]: add_timer -> mod_timer() in dst_run_gc() (diff) | |
| download | linux-a4657141091c2f975fa35ac1ad28fffdd756091e.tar.xz linux-a4657141091c2f975fa35ac1ad28fffdd756091e.zip | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/skbuff.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 19c96d498e20..3573ba9a2555 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1081,7 +1081,7 @@ static inline void __skb_queue_purge(struct sk_buff_head *list) * the headroom they think they need without accounting for the * built in space. The built in space is used for optimisations. * - * %NULL is returned in there is no free memory. + * %NULL is returned if there is no free memory. */ static inline struct sk_buff *__dev_alloc_skb(unsigned int length, gfp_t gfp_mask) @@ -1101,7 +1101,7 @@ static inline struct sk_buff *__dev_alloc_skb(unsigned int length, * the headroom they think they need without accounting for the * built in space. The built in space is used for optimisations. * - * %NULL is returned in there is no free memory. Although this function + * %NULL is returned if there is no free memory. Although this function * allocates memory it can be called from an interrupt. */ static inline struct sk_buff *dev_alloc_skb(unsigned int length) |