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

Commit 54e7ff9d authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

trivial: MPT fusion - remove long dead code 



This triggers false bug reports as it does a bogus kmalloc with locks held
but is never really compiled into the kernel.

Closes #8329

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8638545c

drivers/message/fusion/mptlan.c

+0 −108
Original line number Diff line number Diff line
@@ -77,12 +77,6 @@ MODULE_VERSION(my_VERSION); 
 *  Fusion MPT LAN private structures

 */



struct NAA_Hosed {

	u16 NAA;

	u8 ieee[FC_ALEN];

	struct NAA_Hosed *next;

};



struct BufferControl {

	struct sk_buff	*skb;

	dma_addr_t	dma;
@@ -159,11 +153,6 @@ static u8 LanCtx = MPT_MAX_PROTOCOL_DRIVERS; 
static u32 max_buckets_out = 127;

static u32 tx_max_out_p = 127 - 16;



#ifdef QLOGIC_NAA_WORKAROUND

static struct NAA_Hosed *mpt_bad_naa = NULL;

DEFINE_RWLOCK(bad_naa_lock);

#endif



/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

/**

 *	lan_reply - Handle all data sent from the hardware.
@@ -780,30 +769,6 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev) 
//			ctx, skb, skb->data));



	mac = skb_mac_header(skb);

#ifdef QLOGIC_NAA_WORKAROUND

{

	struct NAA_Hosed *nh;



	/* Munge the NAA for Tx packets to QLogic boards, which don't follow

	   RFC 2625. The longer I look at this, the more my opinion of Qlogic

	   drops. */

	read_lock_irq(&bad_naa_lock);

	for (nh = mpt_bad_naa; nh != NULL; nh=nh->next) {

		if ((nh->ieee[0] == mac[0]) &&

		    (nh->ieee[1] == mac[1]) &&

		    (nh->ieee[2] == mac[2]) &&

		    (nh->ieee[3] == mac[3]) &&

		    (nh->ieee[4] == mac[4]) &&

		    (nh->ieee[5] == mac[5])) {

			cur_naa = nh->NAA;

			dlprintk ((KERN_INFO "mptlan/sdu_send: using NAA value "

				  "= %04x.\n", cur_naa));

			break;

		}

	}

	read_unlock_irq(&bad_naa_lock);

}

#endif



	pTrans->TransactionDetails[0] = cpu_to_le32((cur_naa         << 16) |

						    (mac[0] <<  8) |
@@ -1572,79 +1537,6 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev) 


	fcllc = (struct fcllc *)skb->data;



#ifdef QLOGIC_NAA_WORKAROUND

{

	u16 source_naa = fch->stype, found = 0;



	/* Workaround for QLogic not following RFC 2625 in regards to the NAA

	   value. */



	if ((source_naa & 0xF000) == 0)

		source_naa = swab16(source_naa);



	if (fcllc->ethertype == htons(ETH_P_ARP))

	    dlprintk ((KERN_INFO "mptlan/type_trans: got arp req/rep w/ naa of "

		      "%04x.\n", source_naa));



	if ((fcllc->ethertype == htons(ETH_P_ARP)) &&

	   ((source_naa >> 12) !=  MPT_LAN_NAA_RFC2625)){

		struct NAA_Hosed *nh, *prevnh;

		int i;



		dlprintk ((KERN_INFO "mptlan/type_trans: ARP Req/Rep from "

			  "system with non-RFC 2625 NAA value (%04x).\n",

			  source_naa));



		write_lock_irq(&bad_naa_lock);

		for (prevnh = nh = mpt_bad_naa; nh != NULL;

		     prevnh=nh, nh=nh->next) {

			if ((nh->ieee[0] == fch->saddr[0]) &&

			    (nh->ieee[1] == fch->saddr[1]) &&

			    (nh->ieee[2] == fch->saddr[2]) &&

			    (nh->ieee[3] == fch->saddr[3]) &&

			    (nh->ieee[4] == fch->saddr[4]) &&

			    (nh->ieee[5] == fch->saddr[5])) {

				found = 1;

				dlprintk ((KERN_INFO "mptlan/type_trans: ARP Re"

					 "q/Rep w/ bad NAA from system already"

					 " in DB.\n"));

				break;

			}

		}



		if ((!found) && (nh == NULL)) {



			nh = kmalloc(sizeof(struct NAA_Hosed), GFP_KERNEL);

			dlprintk ((KERN_INFO "mptlan/type_trans: ARP Req/Rep w/"

				 " bad NAA from system not yet in DB.\n"));



			if (nh != NULL) {

				nh->next = NULL;

				if (!mpt_bad_naa)

					mpt_bad_naa = nh;

				if (prevnh)

					prevnh->next = nh;



				nh->NAA = source_naa; /* Set the S_NAA value. */

				for (i = 0; i < FC_ALEN; i++)

					nh->ieee[i] = fch->saddr[i];

				dlprintk ((KERN_INFO "Got ARP from %02x:%02x:%02x:%02x:"

					  "%02x:%02x with non-compliant S_NAA value.\n",

					  fch->saddr[0], fch->saddr[1], fch->saddr[2],

					  fch->saddr[3], fch->saddr[4],fch->saddr[5]));

			} else {

				printk (KERN_ERR "mptlan/type_trans: Unable to"

					" kmalloc a NAA_Hosed struct.\n");

			}

		} else if (!found) {

			printk (KERN_ERR "mptlan/type_trans: found not"

				" set, but nh isn't null. Evil "

				"funkiness abounds.\n");

		}

		write_unlock_irq(&bad_naa_lock);

	}

}

#endif



	/* Strip the SNAP header from ARP packets since we don't

	 * pass them through to the 802.2/SNAP layers.