diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-23 01:22:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-23 01:22:35 -0400 |
| commit | 36583eb54d46c36a447afd6c379839f292397429 (patch) | |
| tree | 70f5399529dc2135a986947b37c655194da60e9d /net/switchdev | |
| parent | fa7912be967102cdbecd8ef172571b28eb22099e (diff) | |
| parent | cf539cbd8a81e12880735a0912de8b99f46c84fd (diff) | |
| download | linux-36583eb54d46c36a447afd6c379839f292397429.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/cadence/macb.c
drivers/net/phy/phy.c
include/linux/skbuff.h
net/ipv4/tcp.c
net/switchdev/switchdev.c
Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD}
renaming overlapping with net-next changes of various
sorts.
phy.c was a case of two changes, one adding a local
variable to a function whilst the second was removing
one.
tcp.c overlapped a deadlock fix with the addition of new tcp_info
statistic values.
macb.c involved the addition of two zyncq device entries.
skbuff.h involved adding back ipv4_daddr to nf_bridge_info
whilst net-next changes put two other existing members of
that struct into a union.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/switchdev')
| -rw-r--r-- | net/switchdev/switchdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index d4c8cf828240..ac853acbe211 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -851,7 +851,7 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi, err = switchdev_port_obj_add(dev, &fib_obj); if (!err) - fi->fib_flags |= RTNH_F_EXTERNAL; + fi->fib_flags |= RTNH_F_OFFLOAD; return err; } @@ -887,7 +887,7 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, struct net_device *dev; int err = 0; - if (!(fi->fib_flags & RTNH_F_EXTERNAL)) + if (!(fi->fib_flags & RTNH_F_OFFLOAD)) return 0; dev = switchdev_get_dev_by_nhs(fi); @@ -896,7 +896,7 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, err = switchdev_port_obj_del(dev, &fib_obj); if (!err) - fi->fib_flags &= ~RTNH_F_EXTERNAL; + fi->fib_flags &= ~RTNH_F_OFFLOAD; return err; } |