diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-08-11 18:43:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-10 10:06:53 -0700 |
| commit | 8b69bd7d8a8927d537f134c37bcca6cbfa58e1b2 (patch) | |
| tree | 4f15d43212cf8d4ccb712d23e5c7c21999e39477 | |
| parent | infiniband: nes: Use skb_peek_next() and skb_queue_walk(). (diff) | |
| download | linux-dev-8b69bd7d8a8927d537f134c37bcca6cbfa58e1b2.tar.xz linux-dev-8b69bd7d8a8927d537f134c37bcca6cbfa58e1b2.zip | |
ppp: Remove direct skb_queue_head list pointer access.
Add a helper, __skb_peek(), and use it in ppp_mp_reconstruct().
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ppp/ppp_generic.c | 2 | ||||
| -rw-r--r-- | include/linux/skbuff.h | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index 02ad03a2fab7..500bc0027c1b 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -2400,7 +2400,7 @@ ppp_mp_reconstruct(struct ppp *ppp) if (ppp->mrru == 0) /* do nothing until mrru is set */ return NULL; - head = list->next; + head = __skb_peek(list); tail = NULL; skb_queue_walk_safe(list, p, tmp) { again: diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 17a13e4785fc..89283b77294d 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1593,6 +1593,17 @@ static inline struct sk_buff *skb_peek(const struct sk_buff_head *list_) } /** + * __skb_peek - peek at the head of a non-empty &sk_buff_head + * @list_: list to peek at + * + * Like skb_peek(), but the caller knows that the list is not empty. + */ +static inline struct sk_buff *__skb_peek(const struct sk_buff_head *list_) +{ + return list_->next; +} + +/** * skb_peek_next - peek skb following the given one from a queue * @skb: skb to start from * @list_: list to peek at |