Staging: octeon: Delete constant zero preprocessor lines
PATCH 1/1 Staging: octeon: Delete constant zero preprocessor lines
This patch fixes the checkpatch.pl warning:
WARNING: Consider removing the code enclosed by this #if 0 and its #endif
Signed-off-by Wentao Cai <[email protected]>
--- drivers/staging/octeon/ethernet-tx.c | 41 ------------------------------------ 1 file changed, 41 deletions(-)
drivers/staging/octeon/ethernet-tx.c +0 -41
@@ -587,43 +587,14 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)if (skb->protocol ==htons (ETH_P_IP )) { work->word2.s.ip_offset =14 ; -#if 0 - work->word2.s.vlan_valid =0 ;/* FIXME */ - work->word2.s.vlan_cfi =0 ;/* FIXME */ - work->word2.s.vlan_id =0 ;/* FIXME */ - work->word2.s.dec_ipcomp =0 ;/* FIXME */ -#endif work->word2.s.tcp_or_udp = (ip_hdr (skb)->protocol ==IPPROTO_TCP ) || (ip_hdr (skb)->protocol ==IPPROTO_UDP ); -#if 0 -/* FIXME */ - work->word2.s.dec_ipsec =0 ; -/* We only support IPv4 right now */ - work->word2.s.is_v6 =0 ; -/* Hardware would set to zero */ - work->word2.s.software =0 ; -/* No error, packet is internal */ - work->word2.s.L4_error =0 ; -#endif work->word2.s.is_frag = !((ip_hdr (skb)->frag_off ==0 ) || (ip_hdr (skb)->frag_off ==1 <<14 )); -#if 0 -/* Assume Linux is sending a good packet */ - work->word2.s.IP_exc =0 ; -#endif work->word2.s.is_bcast = (skb->pkt_type ==PACKET_BROADCAST ); work->word2.s.is_mcast = (skb->pkt_type ==PACKET_MULTICAST ); -#if 0 -/* This is an IP packet */ - work->word2.s.not_IP =0 ; -/* No error, packet is internal */ - work->word2.s.rcv_error =0 ; -/* No error, packet is internal */ - work->word2.s.err_code =0 ; -#endif -/* * When copying the data, include 4 bytes of the * ethernet header to align the same way hardware
@@ -632,12 +603,6 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)memcpy (work->packet_data, skb->data +10 ,sizeof (work->packet_data)); }else { -#if 0 - work->word2.snoip.vlan_valid =0 ;/* FIXME */ - work->word2.snoip.vlan_cfi =0 ;/* FIXME */ - work->word2.snoip.vlan_id =0 ;/* FIXME */ - work->word2.snoip.software =0 ;/* Hardware would set to zero */ -#endif work->word2.snoip.is_rarp = skb->protocol ==htons (ETH_P_RARP ); work->word2.snoip.is_arp = skb->protocol ==htons (ETH_P_ARP ); work->word2.snoip.is_bcast =
@@ -645,12 +610,6 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev) work->word2.snoip.is_mcast = (skb->pkt_type ==PACKET_MULTICAST ); work->word2.snoip.not_IP =1 ;/* IP was done up above */ -#if 0 -/* No error, packet is internal */ - work->word2.snoip.rcv_error =0 ; -/* No error, packet is internal */ - work->word2.snoip.err_code =0 ; -#endif memcpy (work->packet_data, skb->data,sizeof (work->packet_data)); }
Signature · 1 line
2.11.0
Greg Kroah-Hartman
maintainerQuoted 13 lines · Wentao Cai
This patch fixes the checkpatch.pl warning:
WARNING: Consider removing the code enclosed by this #if 0 and its #endifSigned-off-by Wentao Cai <[email protected]>--- drivers/staging/octeon/ethernet-tx.c | 41 ------------------------------------ 1 file changed, 41 deletions(-)drivers/staging/octeon/ethernet-tx.c +0
-0
drivers/staging/octeon/ethernet-tx.c int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev) · line 595
Quoted 9 lines
drivers/staging/octeon/ethernet-tx.c +0
-6@@ -587,43 +587,14 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)if (skb->protocol ==htons (ETH_P_IP )) { work->word2.s.ip_offset =14 ; -#if 0 - work->word2.s.vlan_valid =0 ;/* FIXME */ - work->word2.s.vlan_cfi =0 ;/* FIXME */ - work->word2.s.vlan_id =0 ;/* FIXME */ - work->word2.s.dec_ipcomp =0 ;/* FIXME */ -#endif
These are all things that still need to be fixed in the driver, so I would leave these alone. They are a good indication that work needs to happen here.
thanks,
greg k-h