Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bb79565 authored by Rajesh Borundia's avatar Rajesh Borundia Committed by David S. Miller
Browse files

qlcnic: Fix protcol type in case of inband vlan. 



o Use correct l3 (ETH_IP or ETH_IPV6)protcol in case
of inband vlan. Because of incorrect protcol type driver
was setting incorrect opcode. This resulted in adapter calculating
checksum incorrectly.
o Updated driver version to 5.0.29

Signed-off-by: default avatarRajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: default avatarAnirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e42ede22

drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -36,8 +36,8 @@ 




#define _QLCNIC_LINUX_MAJOR 5

#define _QLCNIC_LINUX_MAJOR 5

#define _QLCNIC_LINUX_MINOR 0

#define _QLCNIC_LINUX_MINOR 0

#define _QLCNIC_LINUX_SUBVERSION 28

#define _QLCNIC_LINUX_SUBVERSION 29

#define QLCNIC_LINUX_VERSIONID  "5.0.28"

#define QLCNIC_LINUX_VERSIONID  "5.0.29"

#define QLCNIC_DRV_IDC_VER  0x01

#define QLCNIC_DRV_IDC_VER  0x01

#define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\

#define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\

		 (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))

		 (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2033,6 +2033,7 @@ qlcnic_tx_pkt(struct qlcnic_adapter *adapter, 
		vh = (struct vlan_ethhdr *)skb->data;

		vh = (struct vlan_ethhdr *)skb->data;

		flags = FLAGS_VLAN_TAGGED;

		flags = FLAGS_VLAN_TAGGED;

		vlan_tci = vh->h_vlan_TCI;

		vlan_tci = vh->h_vlan_TCI;

		protocol = ntohs(vh->h_vlan_encapsulated_proto);

	} else if (vlan_tx_tag_present(skb)) {

	} else if (vlan_tx_tag_present(skb)) {

		flags = FLAGS_VLAN_OOB;

		flags = FLAGS_VLAN_OOB;

		vlan_tci = vlan_tx_tag_get(skb);

		vlan_tci = vlan_tx_tag_get(skb);