[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <SN1PR07MB24478F4FF7ACFE9A5DA6D85B89610@SN1PR07MB2447.namprd07.prod.outlook.com>
Date: Wed, 4 Jan 2017 11:29:05 +0000
From: "Chopra, Manish" <Manish.Chopra@...ium.com>
To: Michał Mirosław <mirq-linux@...e.qmqm.pl>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
CC: "Patil, Harish" <Harish.Patil@...ium.com>,
Dept-GE Linux NIC Dev <Dept-GELinuxNICDev@...ium.com>
Subject: RE: [PATCH net-next v2 04/27] qlcnic: remove assumption that vlan_tci
!= 0
> -----Original Message-----
> From: Michał Mirosław [mailto:mirq-linux@...e.qmqm.pl]
> Sent: Wednesday, January 04, 2017 2:23 AM
> To: netdev@...r.kernel.org
> Cc: Patil, Harish <Harish.Patil@...ium.com>; Chopra, Manish
> <Manish.Chopra@...ium.com>; Dept-GE Linux NIC Dev <Dept-
> GELinuxNICDev@...ium.com>
> Subject: [PATCH net-next v2 04/27] qlcnic: remove assumption that vlan_tci != 0
>
> Signed-off-by: Michał Mirosław <mirq-linux@...e.qmqm.pl>
> ---
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
> b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
> index fedd7366713c..c3cc707cc265 100644
> --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
> +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
> @@ -459,7 +459,7 @@ static int qlcnic_tx_pkt(struct qlcnic_adapter *adapter,
> struct cmd_desc_type0 *first_desc, struct sk_buff *skb,
> struct qlcnic_host_tx_ring *tx_ring)
> {
> - u8 l4proto, opcode = 0, hdr_len = 0;
> + u8 l4proto, opcode = 0, hdr_len = 0, tag_vlan = 0;
> u16 flags = 0, vlan_tci = 0;
> int copied, offset, copy_len, size;
> struct cmd_desc_type0 *hwdesc;
> @@ -472,14 +472,16 @@ static int qlcnic_tx_pkt(struct qlcnic_adapter
> *adapter,
> flags = QLCNIC_FLAGS_VLAN_TAGGED;
> vlan_tci = ntohs(vh->h_vlan_TCI);
> protocol = ntohs(vh->h_vlan_encapsulated_proto);
> + tag_vlan = 1;
> } else if (skb_vlan_tag_present(skb)) {
> flags = QLCNIC_FLAGS_VLAN_OOB;
> vlan_tci = skb_vlan_tag_get(skb);
> + tag_vlan = 1;
> }
> if (unlikely(adapter->tx_pvid)) {
> - if (vlan_tci && !(adapter->flags &
> QLCNIC_TAGGING_ENABLED))
> + if (tag_vlan && !(adapter->flags &
> QLCNIC_TAGGING_ENABLED))
> return -EIO;
> - if (vlan_tci && (adapter->flags & QLCNIC_TAGGING_ENABLED))
> + if (tag_vlan && (adapter->flags &
> QLCNIC_TAGGING_ENABLED))
> goto set_flags;
>
> flags = QLCNIC_FLAGS_VLAN_OOB;
> --
> 2.11.0
>
It's possible that earlier driver tx flow for zero vlan_tci is handled differently by the driver and hence hardware.
Doing this change would cause changing the driver TX flow for zero vlan_tci [specially setting the things in the TX descriptors would be changed now for zero vlan_tci].
Is it really necessary to change the driver behavior for such change until unless there is functional problem with the driver or hardware in handling zero vlan_tci ?
Thanks.
Powered by blists - more mailing lists