diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-26 23:47:03 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 23:47:03 +0400 |
| commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
| tree | cd71e597bbbe677820bb229c6aedbad412758959 /net/core | |
| parent | d6f03f29f7cdf064289f941bf0b838348e996e65 (diff) | |
| parent | fc0b927d9a5024e138c4318fe19a590f23e3eeec (diff) | |
| download | linux-6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/inet_diag.c
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/neighbour.c | 5 | ||||
| -rw-r--r-- | net/core/skbuff.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 2684794458ca..27d3fefeaa13 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -2414,7 +2414,10 @@ static struct pneigh_entry *pneigh_get_next(struct seq_file *seq, struct net *net = seq_file_net(seq); struct neigh_table *tbl = state->tbl; - pn = pn->next; + do { + pn = pn->next; + } while (pn && !net_eq(pneigh_net(pn), net)); + while (!pn) { if (++state->bucket > PNEIGH_HASHMASK) break; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 7dc05ecf040a..678ae4e783aa 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2279,7 +2279,7 @@ static int skb_prepare_for_shift(struct sk_buff *skb) * @shiftlen: shift up to this many bytes * * Attempts to shift up to shiftlen worth of bytes, which may be less than - * the length of the skb, from tgt to skb. Returns number bytes shifted. + * the length of the skb, from skb to tgt. Returns number bytes shifted. * It's up to caller to free skb if everything was shifted. * * If @tgt runs out of frags, the whole operation is aborted. |