From a1a96da49dad736a72c4fc0200137b2f93e33670 Mon Sep 17 00:00:00 2001 From: Phil Oester Date: Mon, 26 Jun 2006 00:00:57 -0700 Subject: [PATCH] --- yaml --- r: 30424 b: refs/heads/master c: f72b948dcbb8558d639214536c2ace1b0760f41d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/skbuff.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 00d2e13d6d94..c2f514dd28ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6048126440dcb3ba01316f961465c0ff5a255dd1 +refs/heads/master: f72b948dcbb8558d639214536c2ace1b0760f41d diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index 8e5044ba3ab6..6edbb90cbcec 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -1739,12 +1739,15 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from, unsigned int to, struct ts_config *config, struct ts_state *state) { + unsigned int ret; + config->get_next_block = skb_ts_get_next_block; config->finish = skb_ts_finish; skb_prepare_seq_read(skb, from, to, TS_SKB_CB(state)); - return textsearch_find(config, state); + ret = textsearch_find(config, state); + return (ret <= to - from ? ret : UINT_MAX); } /**