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

Commit 8215fc60 authored by Tobin C. Harding's avatar Tobin C. Harding Committed by Greg Kroah-Hartman
Browse files

staging: ks7010: remove duplicate code 



Current switch statement has duplicate code in branches. This code can
be put after the switch statement so as to remove the duplication.

Move code to after switch statement, remove duplicate code. Make error
branch return so as not to execute the moved code block. Do not change
the program logic.

Signed-off-by: default avatarTobin C. Harding <me@tobin.cc>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 08484ef4

drivers/staging/ks7010/ks_hostif.c

+12 −22
Original line number Diff line number Diff line
@@ -462,17 +462,6 @@ void hostif_data_indication(struct ks_wlan_private *priv) 
		memcpy(skb_put(skb, size), &eth_hdr->h_proto, size);



		aa1x_hdr = (struct ieee802_1x_hdr *)(priv->rxp + ETHER_HDR_SIZE);

		if (aa1x_hdr->type == IEEE802_1X_TYPE_EAPOL_KEY &&

		    priv->wpa.rsn_enabled)

			atomic_set(&priv->psstatus.snooze_guard, 1);



		/* rx indication */

		skb->dev = priv->net_dev;

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

		priv->nstats.rx_packets++;

		priv->nstats.rx_bytes += rx_ind_size;

		netif_rx(skb);



		break;

	case 0xF0:	/* NETBEUI/NetBIOS */

		rx_ind_size = (priv->rx_size + 2);
@@ -493,6 +482,13 @@ void hostif_data_indication(struct ks_wlan_private *priv) 
		       rx_ind_size - 14);	/* copy after Type */



		aa1x_hdr = (struct ieee802_1x_hdr *)(priv->rxp + 14);

		break;

	default:	/* other rx data */

		DPRINTK(2, "invalid data format\n");

		priv->nstats.rx_errors++;

		return;

	}



	if (aa1x_hdr->type == IEEE802_1X_TYPE_EAPOL_KEY &&

	    priv->wpa.rsn_enabled)

		atomic_set(&priv->psstatus.snooze_guard, 1);
@@ -503,12 +499,6 @@ void hostif_data_indication(struct ks_wlan_private *priv) 
	priv->nstats.rx_packets++;

	priv->nstats.rx_bytes += rx_ind_size;

	netif_rx(skb);



		break;

	default:	/* other rx data */

		DPRINTK(2, "invalid data format\n");

		priv->nstats.rx_errors++;

	}

}



static