diff options
| author |   David Ahern <dsa@cumulusnetworks.com> | 2016-09-10 12:09:57 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-09-10 23:12:52 -0700 |
| commit | e0d56fdd734224666e7bd5fafbc620286d2a7ee8 (patch) | |
| tree | 58f22fb38fb3b2a1e8d7a8933a92f721e6b0682e /net/ipv4/ip_output.c | |
| parent | net: vrf: Flip IPv6 output path from FIB lookup hook to out hook (diff) | |
| download | linux-dev-e0d56fdd734224666e7bd5fafbc620286d2a7ee8.tar.xz linux-dev-e0d56fdd734224666e7bd5fafbc620286d2a7ee8.zip | |
net: l3mdev: remove redundant calls
A previous patch added l3mdev flow update making these hooks
redundant. Remove them.
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 41e10e34769c..05d105832bdb 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1582,8 +1582,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, } oif = arg->bound_dev_if; - if (!oif && netif_index_is_l3_master(net, skb->skb_iif)) - oif = skb->skb_iif; + oif = oif ? : skb->skb_iif; flowi4_init_output(&fl4, oif, IP4_REPLY_MARK(net, skb->mark), |