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

Commit 36b3a628 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: common work skb freeing 



All the management processing functions free the
skb after they are done, so this can be done in
the new common code instead.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1fa57d01

net/mac80211/ibss.c

+0 −2
Original line number Diff line number Diff line
@@ -754,8 +754,6 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, 
		ieee80211_rx_mgmt_auth_ibss(sdata, mgmt, skb->len);

		break;

	}



	kfree_skb(skb);

}



void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)

net/mac80211/iface.c

+2 −1
Original line number Diff line number Diff line
@@ -738,9 +738,10 @@ static void ieee80211_iface_work(struct work_struct *work) 
			break;

		default:

			WARN(1, "frame for unexpected interface type");

			kfree_skb(skb);

			break;

		}



		kfree_skb(skb);

	}



	/* then other type-dependent work */

net/mac80211/mesh.c

+0 −2
Original line number Diff line number Diff line
@@ -620,8 +620,6 @@ void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, 
		ieee80211_mesh_rx_mgmt_action(sdata, mgmt, skb->len, rx_status);

		break;

	}



	kfree_skb(skb);

}



void ieee80211_mesh_work(struct ieee80211_sub_if_data *sdata)

net/mac80211/mlme.c

+1 −4
Original line number Diff line number Diff line
@@ -1754,7 +1754,7 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, 
		default:

			WARN(1, "unexpected: %d", rma);

		}

		goto out;

		return;

	}



	mutex_unlock(&ifmgd->mtx);
@@ -1762,9 +1762,6 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, 
	if (skb->len >= 24 + 2 /* mgmt + deauth reason */ &&

	    (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH)

		cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);



 out:

	kfree_skb(skb);

}



static void ieee80211_sta_timer(unsigned long data)