diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-03-15 10:24:32 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-15 10:24:32 +0000 |
| commit | 8229c885fe361e521ac64de36b16011e54a30de0 (patch) | |
| tree | 572e5d34b16713ddef9e803308c6f72014aff01b /include/net/flow.h | |
| parent | c3c50e8b651887bcefcc13beb3739c00b2379b5c (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
drm: Merge tag 'v3.3-rc7' into drm-core-next
Merge the fixes so far into core-next, needed to test
intel driver.
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'include/net/flow.h')
| -rw-r--r-- | include/net/flow.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/net/flow.h b/include/net/flow.h index 9b582437fbe..6c469dbdb91 100644 --- a/include/net/flow.h +++ b/include/net/flow.h @@ -93,6 +93,16 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif, fl4->fl4_dport = dport; fl4->fl4_sport = sport; } + +/* Reset some input parameters after previous lookup */ +static inline void flowi4_update_output(struct flowi4 *fl4, int oif, __u8 tos, + __be32 daddr, __be32 saddr) +{ + fl4->flowi4_oif = oif; + fl4->flowi4_tos = tos; + fl4->daddr = daddr; + fl4->saddr = saddr; +} struct flowi6 { |