diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-09 14:49:13 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-09 14:49:13 -0400 |
| commit | a4657141091c2f975fa35ac1ad28fffdd756091e (patch) | |
| tree | d284f416d2ffb21d5cb3a74843a9ab976ec32193 /include | |
| parent | 54f58d6c4f15f3bdf15d43fa640ca6de9487f50e (diff) | |
| parent | 7c91767a6b701543c93ebcd611dab61deff3dad1 (diff) | |
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) | |||
| 1081 | * the headroom they think they need without accounting for the | 1081 | * the headroom they think they need without accounting for the |
| 1082 | * built in space. The built in space is used for optimisations. | 1082 | * built in space. The built in space is used for optimisations. |
| 1083 | * | 1083 | * |
| 1084 | * %NULL is returned in there is no free memory. | 1084 | * %NULL is returned if there is no free memory. |
| 1085 | */ | 1085 | */ |
| 1086 | static inline struct sk_buff *__dev_alloc_skb(unsigned int length, | 1086 | static inline struct sk_buff *__dev_alloc_skb(unsigned int length, |
| 1087 | gfp_t gfp_mask) | 1087 | gfp_t gfp_mask) |
| @@ -1101,7 +1101,7 @@ static inline struct sk_buff *__dev_alloc_skb(unsigned int length, | |||
| 1101 | * the headroom they think they need without accounting for the | 1101 | * the headroom they think they need without accounting for the |
| 1102 | * built in space. The built in space is used for optimisations. | 1102 | * built in space. The built in space is used for optimisations. |
| 1103 | * | 1103 | * |
| 1104 | * %NULL is returned in there is no free memory. Although this function | 1104 | * %NULL is returned if there is no free memory. Although this function |
| 1105 | * allocates memory it can be called from an interrupt. | 1105 | * allocates memory it can be called from an interrupt. |
| 1106 | */ | 1106 | */ |
| 1107 | static inline struct sk_buff *dev_alloc_skb(unsigned int length) | 1107 | static inline struct sk_buff *dev_alloc_skb(unsigned int length) |