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

Commit dcf33963 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: clean up ieee80211_subif_start_xmit 



There's no need to carry around a return value
that is always NETDEV_TX_OK anyway.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent fe94fe05

net/mac80211/tx.c

+6 −17
Original line number Original line Diff line number Diff line
@@ -1719,7 +1719,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, 
	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_tx_info *info;

	struct ieee80211_tx_info *info;

	int ret = NETDEV_TX_BUSY, head_need;

	int head_need;

	u16 ethertype, hdrlen,  meshhdrlen = 0;

	u16 ethertype, hdrlen,  meshhdrlen = 0;

	__le16 fc;

	__le16 fc;

	struct ieee80211_hdr hdr;

	struct ieee80211_hdr hdr;
@@ -1735,10 +1735,8 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, 
	u32 info_flags = 0;

	u32 info_flags = 0;

	u16 info_id = 0;

	u16 info_id = 0;





	if (unlikely(skb->len < ETH_HLEN)) {

	if (unlikely(skb->len < ETH_HLEN))

		ret = NETDEV_TX_OK;

		goto fail;

		goto fail;

	}





	/* convert Ethernet header to proper 802.11 header (based on

	/* convert Ethernet header to proper 802.11 header (based on

	 * operation mode) */

	 * operation mode) */
@@ -1786,7 +1784,6 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, 
		if (!sdata->u.mesh.mshcfg.dot11MeshTTL) {

		if (!sdata->u.mesh.mshcfg.dot11MeshTTL) {

			/* Do not send frames with mesh_ttl == 0 */

			/* Do not send frames with mesh_ttl == 0 */

			sdata->u.mesh.mshstats.dropped_frames_ttl++;

			sdata->u.mesh.mshstats.dropped_frames_ttl++;

			ret = NETDEV_TX_OK;

			goto fail;

			goto fail;

		}

		}

		rcu_read_lock();

		rcu_read_lock();
@@ -1879,10 +1876,8 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, 




		if (tdls_direct) {

		if (tdls_direct) {

			/* link during setup - throw out frames to peer */

			/* link during setup - throw out frames to peer */

			if (!tdls_auth) {

			if (!tdls_auth)

				ret = NETDEV_TX_OK;

				goto fail;

				goto fail;

			}





			/* DA SA BSSID */

			/* DA SA BSSID */

			memcpy(hdr.addr1, skb->data, ETH_ALEN);

			memcpy(hdr.addr1, skb->data, ETH_ALEN);
@@ -1916,7 +1911,6 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, 
		hdrlen = 24;

		hdrlen = 24;

		break;

		break;

	default:

	default:

		ret = NETDEV_TX_OK;

		goto fail;

		goto fail;

	}

	}
@@ -1961,7 +1955,6 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, 




		I802_DEBUG_INC(local->tx_handlers_drop_unauth_port);

		I802_DEBUG_INC(local->tx_handlers_drop_unauth_port);





		ret = NETDEV_TX_OK;

		goto fail;

		goto fail;

	}

	}
@@ -2016,11 +2009,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, 
		skb = skb_clone(skb, GFP_ATOMIC);

		skb = skb_clone(skb, GFP_ATOMIC);

		kfree_skb(tmp_skb);

		kfree_skb(tmp_skb);





		if (!skb) {

		if (!skb)

			ret = NETDEV_TX_OK;

			goto fail;

			goto fail;

	}

	}

	}





	hdr.frame_control = fc;

	hdr.frame_control = fc;

	hdr.duration_id = 0;

	hdr.duration_id = 0;
@@ -2122,10 +2113,8 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, 
	return NETDEV_TX_OK;

	return NETDEV_TX_OK;





 fail:

 fail:

	if (ret == NETDEV_TX_OK)

	dev_kfree_skb(skb);

	dev_kfree_skb(skb);



	return NETDEV_TX_OK;

	return ret;

}

}