Commit 728a9972 authored by Ajit Khaparde's avatar Ajit Khaparde Committed by David S. Miller
Browse files

be2net: changes for checksum and segmentation offload



- Enables Rx checksum feature by default.
- Disables support for ipv6 tso.
- Changes in Rx path to handle Rx completions with various checksum options.
Signed-off-by: default avatarAjit Khaparde <ajitk@serverengines.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d1c3c07
...@@ -637,6 +637,22 @@ static void be_rx_stats_update(struct be_adapter *adapter, ...@@ -637,6 +637,22 @@ static void be_rx_stats_update(struct be_adapter *adapter,
stats->be_rx_bytes += pktsize; stats->be_rx_bytes += pktsize;
} }
static inline bool do_pkt_csum(struct be_eth_rx_compl *rxcp, bool cso)
{
u8 l4_cksm, ip_version, ipcksm, tcpf = 0, udpf = 0, ipv6_chk;
l4_cksm = AMAP_GET_BITS(struct amap_eth_rx_compl, l4_cksm, rxcp);
ipcksm = AMAP_GET_BITS(struct amap_eth_rx_compl, ipcksm, rxcp);
ip_version = AMAP_GET_BITS(struct amap_eth_rx_compl, ip_version, rxcp);
if (ip_version) {
tcpf = AMAP_GET_BITS(struct amap_eth_rx_compl, tcpf, rxcp);
udpf = AMAP_GET_BITS(struct amap_eth_rx_compl, udpf, rxcp);
}
ipv6_chk = (ip_version && (tcpf || udpf));
return ((l4_cksm && ipv6_chk && ipcksm) && cso) ? false : true;
}
static struct be_rx_page_info * static struct be_rx_page_info *
get_rx_page_info(struct be_adapter *adapter, u16 frag_idx) get_rx_page_info(struct be_adapter *adapter, u16 frag_idx)
{ {
...@@ -752,9 +768,7 @@ static void be_rx_compl_process(struct be_adapter *adapter, ...@@ -752,9 +768,7 @@ static void be_rx_compl_process(struct be_adapter *adapter,
{ {
struct sk_buff *skb; struct sk_buff *skb;
u32 vtp, vid; u32 vtp, vid;
int l4_cksm;
l4_cksm = AMAP_GET_BITS(struct amap_eth_rx_compl, l4_cksm, rxcp);
vtp = AMAP_GET_BITS(struct amap_eth_rx_compl, vtp, rxcp); vtp = AMAP_GET_BITS(struct amap_eth_rx_compl, vtp, rxcp);
skb = netdev_alloc_skb(adapter->netdev, BE_HDR_LEN + NET_IP_ALIGN); skb = netdev_alloc_skb(adapter->netdev, BE_HDR_LEN + NET_IP_ALIGN);
...@@ -769,10 +783,10 @@ static void be_rx_compl_process(struct be_adapter *adapter, ...@@ -769,10 +783,10 @@ static void be_rx_compl_process(struct be_adapter *adapter,
skb_fill_rx_data(adapter, skb, rxcp); skb_fill_rx_data(adapter, skb, rxcp);
if (l4_cksm && adapter->rx_csum) if (do_pkt_csum(rxcp, adapter->rx_csum))
skb->ip_summed = CHECKSUM_UNNECESSARY;
else
skb->ip_summed = CHECKSUM_NONE; skb->ip_summed = CHECKSUM_NONE;
else
skb->ip_summed = CHECKSUM_UNNECESSARY;
skb->truesize = skb->len + sizeof(struct sk_buff); skb->truesize = skb->len + sizeof(struct sk_buff);
skb->protocol = eth_type_trans(skb, adapter->netdev); skb->protocol = eth_type_trans(skb, adapter->netdev);
...@@ -1626,10 +1640,12 @@ static void be_netdev_init(struct net_device *netdev) ...@@ -1626,10 +1640,12 @@ static void be_netdev_init(struct net_device *netdev)
netdev->features |= NETIF_F_SG | NETIF_F_HW_VLAN_RX | NETIF_F_TSO | netdev->features |= NETIF_F_SG | NETIF_F_HW_VLAN_RX | NETIF_F_TSO |
NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_FILTER | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_FILTER | NETIF_F_IP_CSUM |
NETIF_F_IPV6_CSUM | NETIF_F_TSO6; NETIF_F_IPV6_CSUM;
netdev->flags |= IFF_MULTICAST; netdev->flags |= IFF_MULTICAST;
adapter->rx_csum = true;
BE_SET_NETDEV_OPS(netdev, &be_netdev_ops); BE_SET_NETDEV_OPS(netdev, &be_netdev_ops);
SET_ETHTOOL_OPS(netdev, &be_ethtool_ops); SET_ETHTOOL_OPS(netdev, &be_ethtool_ops);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment