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

Commit 6d3b2cb9 authored by Pekka Enberg's avatar Pekka Enberg Committed by David S. Miller
Browse files

ipg: remove commented out code 



Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: Francois Romieu <romieu@fr.zoreil.com>
Cc: Sorbica Shieh <sorbica@icplus.com.tw>
Cc: Jesse Huang <jesse@icplus.com.tw>
parent 1662e4b7

drivers/net/ipg.c

+6 −28
Original line number Diff line number Diff line
@@ -1483,27 +1483,6 @@ static int ipg_nic_rx(struct net_device *dev) 
			/* Set the buffer's protocol field to Ethernet. */

			skb->protocol = eth_type_trans(skb, dev);



			/* If the frame contains an IP/TCP/UDP frame,

			 * determine if upper layer must check IP/TCP/UDP

			 * checksums.

			 *

			 * NOTE: DO NOT RELY ON THE TCP/UDP CHECKSUM

			 *       VERIFICATION FOR SILICON REVISIONS B3

			 *       AND EARLIER!

			 *

			 if ((le64_to_cpu(rxfd->rfs &

			     (IPG_RFS_TCPDETECTED | IPG_RFS_UDPDETECTED |

			      IPG_RFS_IPDETECTED))) &&

			    !(le64_to_cpu(rxfd->rfs &

			      (IPG_RFS_TCPERROR | IPG_RFS_UDPERROR |

			       IPG_RFS_IPERROR)))) {

				 * Indicate IP checksums were performed

				 * by the IPG.

				 *

				skb->ip_summed = CHECKSUM_UNNECESSARY;

			 } else

			 */

			 {

			/* The IPG encountered an error with (or

			 * there were no) IP/TCP/UDP checksums.

			 * This may or may not indicate an invalid
@@ -1511,7 +1490,6 @@ static int ipg_nic_rx(struct net_device *dev) 
			 * upper layer decide.

			 */

			skb->ip_summed = CHECKSUM_NONE;

			}



			/* Hand off frame for higher layer processing.

			 * The function netif_rx() releases the sk_buff

drivers/net/ipg.h

+1 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/skbuff.h>

#include <linux/version.h>

#include <asm/bitops.h>

/*#include <asm/spinlock.h>*/



/*

 *	Constants
@@ -733,8 +732,7 @@ enum ipg_regs { 
 * Miscellaneous macros.

 */



/* Marco for printing debug statements.

#  define IPG_DDEBUG_MSG(args...) printk(KERN_DEBUG "IPG: " ## args) */

/* Marco for printing debug statements. */

#ifdef IPG_DEBUG

#  define IPG_DEBUG_MSG(args...)

#  define IPG_DDEBUG_MSG(args...) printk(KERN_DEBUG "IPG: " args)