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

Commit 6646baf7 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: octeon-ethernet: eliminate USE_HW_TCPUDP_CHECKSUM define 



HW checksum is always enabled, so delete a redundant define.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 25efe08e

drivers/staging/octeon/ethernet-defines.h

+0 −6
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ 
 *      Tells the driver to populate the packet buffers with kernel skbuffs.

 *      This allows the driver to receive packets without copying them. It also

 *      means that 32bit userspace can't access the packet buffers.

 *  USE_HW_TCPUDP_CHECKSUM

 *      Controls if the Octeon TCP/UDP checksum engine is used for packet

 *      output. If this is zero, the kernel will perform the checksum in

 *      software.

 *  USE_ASYNC_IOBDMA

 *      Use asynchronous IO access to hardware. This uses Octeon's asynchronous

 *      IOBDMAs to issue IO accesses without stalling. Set this to zero
@@ -61,8 +57,6 @@ 
#define REUSE_SKBUFFS_WITHOUT_FREE  1

#endif



#define USE_HW_TCPUDP_CHECKSUM      1



/* Enable Random Early Dropping under load */

#define USE_RED                     1

#define USE_ASYNC_IOBDMA            (CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0)

drivers/staging/octeon/ethernet-tx.c

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) 
dont_put_skbuff_in_hw:



	/* Check if we can use the hardware checksumming */

	if (USE_HW_TCPUDP_CHECKSUM && (skb->protocol == htons(ETH_P_IP)) &&

	if ((skb->protocol == htons(ETH_P_IP)) &&

	    (ip_hdr(skb)->version == 4) && (ip_hdr(skb)->ihl == 5) &&

	    ((ip_hdr(skb)->frag_off == 0) || (ip_hdr(skb)->frag_off == htons(1 << 14)))

	    && ((ip_hdr(skb)->protocol == IPPROTO_TCP)

drivers/staging/octeon/ethernet.c

+2 −5
Original line number Diff line number Diff line
@@ -468,11 +468,8 @@ int cvm_oct_common_init(struct net_device *dev) 
	    && (always_use_pow || strstr(pow_send_list, dev->name)))

		priv->queue = -1;



	if (priv->queue != -1) {

		dev->features |= NETIF_F_SG;

		if (USE_HW_TCPUDP_CHECKSUM)

			dev->features |= NETIF_F_IP_CSUM;

	}

	if (priv->queue != -1)

		dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;



	/* We do our own locking, Linux doesn't need to */

	dev->features |= NETIF_F_LLTX;