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

Commit ff688089 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[MAC80211]: move some rate control functions out of ieee80211.c 



I think these can go with rate control just as well and it makes
ieee80211.c more readable.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1f5a7e47

net/mac80211/ieee80211.c

+0 −41
Original line number Diff line number Diff line
@@ -1542,47 +1542,6 @@ void ieee80211_if_mgmt_setup(struct net_device *dev) 
	dev->destructor = ieee80211_if_free;

}



int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,

				 const char *name)

{

	struct rate_control_ref *ref, *old;



	ASSERT_RTNL();

	if (local->open_count || netif_running(local->mdev) ||

	    (local->apdev && netif_running(local->apdev)))

		return -EBUSY;



	ref = rate_control_alloc(name, local);

	if (!ref) {

		printk(KERN_WARNING "%s: Failed to select rate control "

		       "algorithm\n", local->mdev->name);

		return -ENOENT;

	}



	old = local->rate_ctrl;

	local->rate_ctrl = ref;

	if (old) {

		rate_control_put(old);

		sta_info_flush(local, NULL);

	}



	printk(KERN_DEBUG "%s: Selected rate control "

	       "algorithm '%s'\n", local->mdev->name,

	       ref->ops->name);





	return 0;

}



static void rate_control_deinitialize(struct ieee80211_local *local)

{

	struct rate_control_ref *ref;



	ref = local->rate_ctrl;

	local->rate_ctrl = NULL;

	rate_control_put(ref);

}



struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,

					const struct ieee80211_ops *ops)

{

net/mac80211/ieee80211_i.h

+0 −2
Original line number Diff line number Diff line
@@ -727,8 +727,6 @@ void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx); 
int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr);

void ieee80211_if_setup(struct net_device *dev);

void ieee80211_if_mgmt_setup(struct net_device *dev);

int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,

				 const char *name);

struct net_device_stats *ieee80211_dev_stats(struct net_device *dev);

struct ieee80211_rate *ieee80211_get_rate(struct ieee80211_local *local,

					  int phymode, int hwrate);

net/mac80211/ieee80211_rate.c

+42 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <linux/kernel.h>

#include <linux/rtnetlink.h>

#include "ieee80211_rate.h"

#include "ieee80211_i.h"
@@ -137,3 +138,44 @@ void rate_control_put(struct rate_control_ref *ref) 
{

	kref_put(&ref->kref, rate_control_release);

}



int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,

				 const char *name)

{

	struct rate_control_ref *ref, *old;



	ASSERT_RTNL();

	if (local->open_count || netif_running(local->mdev) ||

	    (local->apdev && netif_running(local->apdev)))

		return -EBUSY;



	ref = rate_control_alloc(name, local);

	if (!ref) {

		printk(KERN_WARNING "%s: Failed to select rate control "

		       "algorithm\n", local->mdev->name);

		return -ENOENT;

	}



	old = local->rate_ctrl;

	local->rate_ctrl = ref;

	if (old) {

		rate_control_put(old);

		sta_info_flush(local, NULL);

	}



	printk(KERN_DEBUG "%s: Selected rate control "

	       "algorithm '%s'\n", local->mdev->name,

	       ref->ops->name);





	return 0;

}



void rate_control_deinitialize(struct ieee80211_local *local)

{

	struct rate_control_ref *ref;



	ref = local->rate_ctrl;

	local->rate_ctrl = NULL;

	rate_control_put(ref);

}

net/mac80211/ieee80211_rate.h

+6 −0
Original line number Diff line number Diff line
@@ -141,4 +141,10 @@ static inline void rate_control_remove_sta_debugfs(struct sta_info *sta) 
#endif

}





/* functions for rate control related to a device */

int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,

				 const char *name);

void rate_control_deinitialize(struct ieee80211_local *local);



#endif /* IEEE80211_RATE_H */