diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /net/ipv4/fib_semantics.c | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'net/ipv4/fib_semantics.c')
| -rw-r--r-- | net/ipv4/fib_semantics.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index f831df500907..9b096d6ff3f2 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c | |||
| @@ -866,8 +866,7 @@ failure: | |||
| 866 | 866 | ||
| 867 | /* Note! fib_semantic_match intentionally uses RCU list functions. */ | 867 | /* Note! fib_semantic_match intentionally uses RCU list functions. */ |
| 868 | int fib_semantic_match(struct list_head *head, const struct flowi *flp, | 868 | int fib_semantic_match(struct list_head *head, const struct flowi *flp, |
| 869 | struct fib_result *res, __be32 zone, __be32 mask, | 869 | struct fib_result *res, int prefixlen) |
| 870 | int prefixlen) | ||
| 871 | { | 870 | { |
| 872 | struct fib_alias *fa; | 871 | struct fib_alias *fa; |
| 873 | int nh_sel = 0; | 872 | int nh_sel = 0; |