Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: octeon: Clean up dead code in ethernet-tx.c

Remove multiple blocks of non-functional code disabled via '#if 0'.

The removed code was a placeholder for incomplete hardware offload
features, as indicated by `FIXME` comments. Remove this dead
code to simplify the driver.

Signed-off-by: Mohammed GUERMOUD <mohammed.guermoud@gmail.com>
Link: https://lore.kernel.org/r/20250829170253.16737-1-mohammed.guermoud@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Mohammed GUERMOUD and committed by
Greg Kroah-Hartman
5ff310ce 0bbf8fb9

-40
-40
drivers/staging/octeon/ethernet-tx.c
··· 574 574 575 575 if (skb->protocol == htons(ETH_P_IP)) { 576 576 work->word2.s.ip_offset = 14; 577 - #if 0 578 - work->word2.s.vlan_valid = 0; /* FIXME */ 579 - work->word2.s.vlan_cfi = 0; /* FIXME */ 580 - work->word2.s.vlan_id = 0; /* FIXME */ 581 - work->word2.s.dec_ipcomp = 0; /* FIXME */ 582 - #endif 583 577 work->word2.s.tcp_or_udp = 584 578 (ip_hdr(skb)->protocol == IPPROTO_TCP) || 585 579 (ip_hdr(skb)->protocol == IPPROTO_UDP); 586 - #if 0 587 - /* FIXME */ 588 - work->word2.s.dec_ipsec = 0; 589 - /* We only support IPv4 right now */ 590 - work->word2.s.is_v6 = 0; 591 - /* Hardware would set to zero */ 592 - work->word2.s.software = 0; 593 - /* No error, packet is internal */ 594 - work->word2.s.L4_error = 0; 595 - #endif 596 580 work->word2.s.is_frag = !((ip_hdr(skb)->frag_off == 0) || 597 581 (ip_hdr(skb)->frag_off == 598 582 cpu_to_be16(1 << 14))); 599 - #if 0 600 - /* Assume Linux is sending a good packet */ 601 - work->word2.s.IP_exc = 0; 602 - #endif 603 583 work->word2.s.is_bcast = (skb->pkt_type == PACKET_BROADCAST); 604 584 work->word2.s.is_mcast = (skb->pkt_type == PACKET_MULTICAST); 605 - #if 0 606 - /* This is an IP packet */ 607 - work->word2.s.not_IP = 0; 608 - /* No error, packet is internal */ 609 - work->word2.s.rcv_error = 0; 610 - /* No error, packet is internal */ 611 - work->word2.s.err_code = 0; 612 - #endif 613 585 614 586 /* 615 587 * When copying the data, include 4 bytes of the ··· 591 619 memcpy(work->packet_data, skb->data + 10, 592 620 sizeof(work->packet_data)); 593 621 } else { 594 - #if 0 595 - work->word2.snoip.vlan_valid = 0; /* FIXME */ 596 - work->word2.snoip.vlan_cfi = 0; /* FIXME */ 597 - work->word2.snoip.vlan_id = 0; /* FIXME */ 598 - work->word2.snoip.software = 0; /* Hardware would set to zero */ 599 - #endif 600 622 work->word2.snoip.is_rarp = skb->protocol == htons(ETH_P_RARP); 601 623 work->word2.snoip.is_arp = skb->protocol == htons(ETH_P_ARP); 602 624 work->word2.snoip.is_bcast = ··· 598 632 work->word2.snoip.is_mcast = 599 633 (skb->pkt_type == PACKET_MULTICAST); 600 634 work->word2.snoip.not_IP = 1; /* IP was done up above */ 601 - #if 0 602 - /* No error, packet is internal */ 603 - work->word2.snoip.rcv_error = 0; 604 - /* No error, packet is internal */ 605 - work->word2.snoip.err_code = 0; 606 - #endif 607 635 memcpy(work->packet_data, skb->data, sizeof(work->packet_data)); 608 636 } 609 637