summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Feldman <sfeldma@gmail.com>2015-05-13 06:03:52 (GMT)
committerDavid S. Miller <davem@davemloft.net>2015-05-13 16:26:27 (GMT)
commit7a7ee5312d133a01cb23626c133ae30692ecb748 (patch)
tree5ffdd713353c351ced771f5dbddd378285ce890f
parent22c1f67ea5cd3296ee82df7397fb5e5f81eccb98 (diff)
downloadlinux-7a7ee5312d133a01cb23626c133ae30692ecb748.tar.xz
switchdev: sparse warning: pass ipv4 fib dst as network-byte order
And let driver convert it to host-byte order as needed. Signed-off-by: Scott Feldman <sfeldma@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/rocker/rocker.c7
-rw-r--r--net/switchdev/switchdev.c4
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 1fc006b..ca53393 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4471,7 +4471,7 @@ static int rocker_port_obj_add(struct net_device *dev,
case SWITCHDEV_OBJ_IPV4_FIB:
fib4 = &obj->ipv4_fib;
err = rocker_port_fib_ipv4(rocker_port, obj->trans,
- fib4->dst, fib4->dst_len,
+ htonl(fib4->dst), fib4->dst_len,
fib4->fi, fib4->tb_id, 0);
break;
default:
@@ -4525,8 +4525,9 @@ static int rocker_port_obj_del(struct net_device *dev,
case SWITCHDEV_OBJ_IPV4_FIB:
fib4 = &obj->ipv4_fib;
err = rocker_port_fib_ipv4(rocker_port, SWITCHDEV_TRANS_NONE,
- fib4->dst, fib4->dst_len, fib4->fi,
- fib4->tb_id, ROCKER_OP_FLAG_REMOVE);
+ htonl(fib4->dst), fib4->dst_len,
+ fib4->fi, fib4->tb_id,
+ ROCKER_OP_FLAG_REMOVE);
break;
default:
err = -EOPNOTSUPP;
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index a267f77..77f1b6e 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -645,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,
@@ -699,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,