diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-07-22 14:00:50 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-07-22 14:00:50 +0930 |
| commit | 48be0c57f9c5f5c197fba129924709660a23a4a0 (patch) | |
| tree | 4601cbecb454dfab02631248b7bb8eb5d239c165 /drivers/net/ethernet/rocker/rocker.c | |
| parent | b951233aa15e85d43aed2421e0adac1a2abc5770 (diff) | |
| parent | 35467dc7630af60abacc330f64029d081f160530 (diff) | |
| download | talos-obmc-linux-48be0c57f9c5f5c197fba129924709660a23a4a0.tar.gz talos-obmc-linux-48be0c57f9c5f5c197fba129924709660a23a4a0.zip | |
Merge tag 'v4.4.15' into dev-4.4
This is the 4.4.15 stable release
Diffstat (limited to 'drivers/net/ethernet/rocker/rocker.c')
| -rw-r--r-- | drivers/net/ethernet/rocker/rocker.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c index 2b34622a4bfe..3920c3eb6006 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -4475,7 +4475,7 @@ static int rocker_port_obj_add(struct net_device *dev, fib4 = SWITCHDEV_OBJ_IPV4_FIB(obj); err = rocker_port_fib_ipv4(rocker_port, trans, htonl(fib4->dst), fib4->dst_len, - &fib4->fi, fib4->tb_id, 0); + fib4->fi, fib4->tb_id, 0); break; case SWITCHDEV_OBJ_ID_PORT_FDB: err = rocker_port_fdb_add(rocker_port, trans, @@ -4547,7 +4547,7 @@ static int rocker_port_obj_del(struct net_device *dev, fib4 = SWITCHDEV_OBJ_IPV4_FIB(obj); err = rocker_port_fib_ipv4(rocker_port, NULL, htonl(fib4->dst), fib4->dst_len, - &fib4->fi, fib4->tb_id, + fib4->fi, fib4->tb_id, ROCKER_OP_FLAG_REMOVE); break; case SWITCHDEV_OBJ_ID_PORT_FDB: |
