From 80394fe28abe4984cd2e879b7e4da2c33a50b8ab Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Mon, 11 Aug 2008 18:17:17 -0700 Subject: [PATCH] --- yaml --- r: 108371 b: refs/heads/master c: 987c402ac31988f7ecdb38b657bcfeea5831d479 h: refs/heads/master i: 108369: f743e17dc2c26aca8b7784edd5762c3cf5657e6d 108367: b8586ab31841193feaa085b2ac0c28821edbb5aa v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 610452250e71..1035c60254db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1cfa26661a85549063e369e2b40275eeaa7b923c +refs/heads/master: 987c402ac31988f7ecdb38b657bcfeea5831d479 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index cfcc45b3bef0..358661c9990e 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -901,7 +901,7 @@ extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta); static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len) { if (len > skb_headlen(skb) && - !__pskb_pull_tail(skb, len-skb_headlen(skb))) + !__pskb_pull_tail(skb, len - skb_headlen(skb))) return NULL; skb->len -= len; return skb->data += len; @@ -918,7 +918,7 @@ static inline int pskb_may_pull(struct sk_buff *skb, unsigned int len) return 1; if (unlikely(len > skb->len)) return 0; - return __pskb_pull_tail(skb, len-skb_headlen(skb)) != NULL; + return __pskb_pull_tail(skb, len - skb_headlen(skb)) != NULL; } /** @@ -1321,7 +1321,7 @@ static inline int skb_padto(struct sk_buff *skb, unsigned int len) unsigned int size = skb->len; if (likely(size >= len)) return 0; - return skb_pad(skb, len-size); + return skb_pad(skb, len - size); } static inline int skb_add_data(struct sk_buff *skb,