aboutsummaryrefslogtreecommitdiffstats
path: root/net/switchdev/switchdev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-05-13 12:26:28 -0400
committerDavid S. Miller <davem@davemloft.net>2015-05-13 12:26:28 -0400
commit1f7bd29bc0559aedae857639ca391c815e47f1d9 (patch)
tree727956bafa5be9f535d95d6d043833e887fbefc9 /net/switchdev/switchdev.c
parent9449c3cd90472141cf081af88181a56163ff7132 (diff)
parent1f5dc44c881281c6573b73366bcfde575074d1b0 (diff)
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/switchdev.c')
-rw-r--r--net/switchdev/switchdev.c7
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)
188} 188}
189EXPORT_SYMBOL_GPL(switchdev_port_attr_set); 189EXPORT_SYMBOL_GPL(switchdev_port_attr_set);
190 190
191int __switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj) 191static int __switchdev_port_obj_add(struct net_device *dev,
192 struct switchdev_obj *obj)
192{ 193{
193 const struct switchdev_ops *ops = dev->switchdev_ops; 194 const struct switchdev_ops *ops = dev->switchdev_ops;
194 struct net_device *lower_dev; 195 struct net_device *lower_dev;
@@ -644,7 +645,7 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
644 struct switchdev_obj fib_obj = { 645 struct switchdev_obj fib_obj = {
645 .id = SWITCHDEV_OBJ_IPV4_FIB, 646 .id = SWITCHDEV_OBJ_IPV4_FIB,
646 .ipv4_fib = { 647 .ipv4_fib = {
647 .dst = htonl(dst), 648 .dst = dst,
648 .dst_len = dst_len, 649 .dst_len = dst_len,
649 .fi = fi, 650 .fi = fi,
650 .tos = tos, 651 .tos = tos,
@@ -698,7 +699,7 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
698 struct switchdev_obj fib_obj = { 699 struct switchdev_obj fib_obj = {
699 .id = SWITCHDEV_OBJ_IPV4_FIB, 700 .id = SWITCHDEV_OBJ_IPV4_FIB,
700 .ipv4_fib = { 701 .ipv4_fib = {
701 .dst = htonl(dst), 702 .dst = dst,
702 .dst_len = dst_len, 703 .dst_len = dst_len,
703 .fi = fi, 704 .fi = fi,
704 .tos = tos, 705 .tos = tos,