On Wed, Jul 8, 2015 at 9:26 PM, Simon Horman <simon.hor...@netronome.com> wrote:
> Hi Scott,
>
> On Wed, Jul 08, 2015 at 04:16:42PM -0700, sfel...@gmail.com wrote:
>> From: Scott Feldman <sfel...@gmail.com>
>>
>> If device flags ingress packet as "fwd offload", mark the
>> skb->offlaod_fwd_mark using the ingress port's dev->offlaod_fwd_mark. This
>> will be the hint to the kernel that this packet has already been forwarded
>> by device to egress ports matching skb->offlaod_fwd_mark.
>>
>> For rocker, derive port dev->offlaod_fwd_mark based on device switch ID and
>> port ifindex. If port is bridged, use the bridge ifindex rather than the
>> port ifindex.
>>
>> Signed-off-by: Scott Feldman <sfel...@gmail.com>
>
> [snip]
>
>> diff --git a/drivers/net/ethernet/rocker/rocker.c
>> b/drivers/net/ethernet/rocker/rocker.c
>> index c005167..a4ced91 100644
>> --- a/drivers/net/ethernet/rocker/rocker.c
>> +++ b/drivers/net/ethernet/rocker/rocker.c
>
> [snip]
>
>> @@ -4938,11 +4944,13 @@ static int rocker_probe_port(struct rocker *rocker,
>> unsigned int port_number)
>> }
>> rocker->ports[port_number] = rocker_port;
>>
>> + switchdev_port_fwd_mark_set(rocker_port->dev, NULL, false);
>> +
>> rocker_port_set_learning(rocker_port, SWITCHDEV_TRANS_NONE);
>>
>> err = rocker_port_ig_tbl(rocker_port, SWITCHDEV_TRANS_NONE, 0);
>> if (err) {
>> - dev_err(&pdev->dev, "install ig port table failed\n");
>> + netdev_err(rocker_port->dev, "install ig port table failed\n");
>> goto err_port_ig_tbl;
>> }
>
> It is unclear to me how the above *_err change and...
>
>>
>> @@ -4962,6 +4970,7 @@ err_untagged_vlan:
>> rocker_port_ig_tbl(rocker_port, SWITCHDEV_TRANS_NONE,
>> ROCKER_OP_FLAG_REMOVE);
>> err_port_ig_tbl:
>> + rocker->ports[port_number] = NULL;
>> unregister_netdev(dev);
>> err_register_netdev:
>> free_netdev(dev);
>
> ... the above ports[] change relate to the rest of this patch.
Not related; I'll pull those out for v2 and send under separate cover.
Thanks for reviewing.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
