iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netxen: fix vlan tso/checksum offload

Browse Source 
o set netdev->vlan_features appropriately.
o fix tso descriptor initialization for vlan case.

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dhananjay Phadke 2009-01-26 12:34:57 -08:00 committed by David S. Miller
parent 3121a48d87
commit cdff103649
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/net/netxen/netxen_nic_main.c
View File

@ -735,17 +735,18 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
SET_ETHTOOL_OPS(netdev, &netxen_nic_ethtool_ops); SET_ETHTOOL_OPS(netdev, &netxen_nic_ethtool_ops);
/* ScatterGather support */ netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
netdev->features = NETIF_F_SG; netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
netdev->features |= NETIF_F_IP_CSUM;
netdev->features |= NETIF_F_TSO;
if (NX_IS_REVISION_P3(revision_id)) { if (NX_IS_REVISION_P3(revision_id)) {
netdev->features |= NETIF_F_IPV6_CSUM; netdev->features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
netdev->features |= NETIF_F_TSO6; netdev->vlan_features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
} }
if (adapter->pci_using_dac) if (adapter->pci_using_dac) {
netdev->features |= NETIF_F_HIGHDMA; netdev->features |= NETIF_F_HIGHDMA;
netdev->vlan_features |= NETIF_F_HIGHDMA;
}
/* /*
* Set the CRB window to invalid. If any register in window 0 is * Set the CRB window to invalid. If any register in window 0 is
@ -1166,6 +1167,14 @@ static bool netxen_tso_check(struct net_device *netdev,
{ {
bool tso = false; bool tso = false;
u8 opcode = TX_ETHER_PKT; u8 opcode = TX_ETHER_PKT;
__be16 protocol = skb->protocol;
u16 flags = 0;
if (protocol == __constant_htons(ETH_P_8021Q)) {
struct vlan_ethhdr *vh = (struct vlan_ethhdr *)skb->data;
protocol = vh->h_vlan_encapsulated_proto;
flags = FLAGS_VLAN_TAGGED;
}
if ((netdev->features & (NETIF_F_TSO | NETIF_F_TSO6)) && if ((netdev->features & (NETIF_F_TSO | NETIF_F_TSO6)) &&
skb_shinfo(skb)->gso_size > 0) { skb_shinfo(skb)->gso_size > 0) {
@ -1174,21 +1183,21 @@ static bool netxen_tso_check(struct net_device *netdev,
desc->total_hdr_length = desc->total_hdr_length =
skb_transport_offset(skb) + tcp_hdrlen(skb); skb_transport_offset(skb) + tcp_hdrlen(skb);
opcode = (skb->protocol == htons(ETH_P_IPV6)) ? opcode = (protocol == __constant_htons(ETH_P_IPV6)) ?
TX_TCP_LSO6 : TX_TCP_LSO; TX_TCP_LSO6 : TX_TCP_LSO;
tso = true; tso = true;
} else if (skb->ip_summed == CHECKSUM_PARTIAL) { } else if (skb->ip_summed == CHECKSUM_PARTIAL) {
u8 l4proto; u8 l4proto;
if (skb->protocol == htons(ETH_P_IP)) { if (protocol == __constant_htons(ETH_P_IP)) {
l4proto = ip_hdr(skb)->protocol; l4proto = ip_hdr(skb)->protocol;
if (l4proto == IPPROTO_TCP) if (l4proto == IPPROTO_TCP)
opcode = TX_TCP_PKT; opcode = TX_TCP_PKT;
else if(l4proto == IPPROTO_UDP) else if(l4proto == IPPROTO_UDP)
opcode = TX_UDP_PKT; opcode = TX_UDP_PKT;
} else if (skb->protocol == htons(ETH_P_IPV6)) { } else if (protocol == __constant_htons(ETH_P_IPV6)) {
l4proto = ipv6_hdr(skb)->nexthdr; l4proto = ipv6_hdr(skb)->nexthdr;
if (l4proto == IPPROTO_TCP) if (l4proto == IPPROTO_TCP)
@ -1199,7 +1208,7 @@ static bool netxen_tso_check(struct net_device *netdev,
} }
desc->tcp_hdr_offset = skb_transport_offset(skb); desc->tcp_hdr_offset = skb_transport_offset(skb);
desc->ip_hdr_offset = skb_network_offset(skb); desc->ip_hdr_offset = skb_network_offset(skb);
netxen_set_tx_flags_opcode(desc, 0, opcode); netxen_set_tx_flags_opcode(desc, flags, opcode);
return tso; return tso;
} }