diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-22 19:33:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-22 19:33:00 -0400 |
| commit | 38afd6adf6bccd7176e88c07cac104d3639aa30d (patch) | |
| tree | 2142409984b609e51ef60b6a14318dd4e878718a /include/linux/skbuff.h | |
| parent | 8ed1383fb7b6685968588141d5934e0e6715e954 (diff) | |
| parent | 261688d01ec07d3a265b8ace6ec68310fbd96a96 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 5d4a990d5577..0061c9470482 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
| @@ -502,7 +502,8 @@ static inline struct sk_buff *skb_share_check(struct sk_buff *skb, | |||
| 502 | * | 502 | * |
| 503 | * %NULL is returned on a memory allocation failure. | 503 | * %NULL is returned on a memory allocation failure. |
| 504 | */ | 504 | */ |
| 505 | static inline struct sk_buff *skb_unshare(struct sk_buff *skb, int pri) | 505 | static inline struct sk_buff *skb_unshare(struct sk_buff *skb, |
| 506 | unsigned int __nocast pri) | ||
| 506 | { | 507 | { |
| 507 | might_sleep_if(pri & __GFP_WAIT); | 508 | might_sleep_if(pri & __GFP_WAIT); |
| 508 | if (skb_cloned(skb)) { | 509 | if (skb_cloned(skb)) { |