diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-13 19:26:28 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-13 19:26:28 +0300 |
| commit | 1f7bd29bc0559aedae857639ca391c815e47f1d9 (patch) | |
| tree | 727956bafa5be9f535d95d6d043833e887fbefc9 /net/switchdev | |
| parent | 9449c3cd90472141cf081af88181a56163ff7132 (diff) | |
| parent | 1f5dc44c881281c6573b73366bcfde575074d1b0 (diff) | |
| download | linux-1f7bd29bc0559aedae857639ca391c815e47f1d9.tar.xz | |
Merge branch 'switchdev-cleanups'
Scott Feldman says:
====================
switchdev: more (minor) cleanups
Fix some sparse warnings and include some documentation review comments that
didn't get picked up in the switchdev Spring Cleanup series.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/switchdev')
| -rw-r--r-- | net/switchdev/switchdev.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 65d49d4477b9..77f1b6e3f78e 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -188,7 +188,8 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr) } EXPORT_SYMBOL_GPL(switchdev_port_attr_set); -int __switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj) +static int __switchdev_port_obj_add(struct net_device *dev, + struct switchdev_obj *obj) { const struct switchdev_ops *ops = dev->switchdev_ops; struct net_device *lower_dev; @@ -644,7 +645,7 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi, struct switchdev_obj fib_obj = { .id = SWITCHDEV_OBJ_IPV4_FIB, .ipv4_fib = { - .dst = htonl(dst), + .dst = dst, .dst_len = dst_len, .fi = fi, .tos = tos, @@ -698,7 +699,7 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, struct switchdev_obj fib_obj = { .id = SWITCHDEV_OBJ_IPV4_FIB, .ipv4_fib = { - .dst = htonl(dst), + .dst = dst, .dst_len = dst_len, .fi = fi, .tos = tos, |