diff options
author | David S. Miller <davem@davemloft.net> | 2015-06-03 23:47:24 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-06-03 23:47:24 -0700 |
commit | 37c8e2b069c7ccff3ff6a356f82ed11abab5fb99 (patch) | |
tree | c09e8d383d5c070d137afe898f589575d74566ff /net | |
parent | 9d1dabfbd0760269475a0cbbcc568505aa3ada60 (diff) | |
parent | 7616dcbb212eeec00c9bcc0fecb953fdee60634c (diff) | |
download | lwn-37c8e2b069c7ccff3ff6a356f82ed11abab5fb99.tar.gz lwn-37c8e2b069c7ccff3ff6a356f82ed11abab5fb99.zip |
Merge branch 'switchdev-next'
Scott Feldman says:
====================
switchdev: documentation updates
Update the switchdev documentation to clarify that for IPV4 FIB object, the add
op is used for both adding and modifying the FIB entry on the device.
I found a few other white-space and grammer issues to fix, and to clarify the
static FDB ops.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/switchdev/switchdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index ac853acbe211..e008057dab46 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -803,7 +803,7 @@ static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi) } /** - * switchdev_fib_ipv4_add - Add IPv4 route entry to switch + * switchdev_fib_ipv4_add - Add/modify switch IPv4 route entry * * @dst: route's IPv4 destination address * @dst_len: destination address length (prefix length) @@ -813,7 +813,7 @@ static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi) * @nlflags: netlink flags passed in (NLM_F_*) * @tb_id: route table ID * - * Add IPv4 route entry to switch device. + * Add/modify switch IPv4 route entry. */ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi, u8 tos, u8 type, u32 nlflags, u32 tb_id) |