projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
net
/
mac80211
/
rc80211_minstrel.c
diff --git
a/net/mac80211/rc80211_minstrel.c
b/net/mac80211/rc80211_minstrel.c
index 6e5d68b4e427a232dfeebcfe98f666bb2618bb1c..f65ce6dcc8e25d3aec3afe2ea9af85bd1b5932de 100644
(file)
--- a/
net/mac80211/rc80211_minstrel.c
+++ b/
net/mac80211/rc80211_minstrel.c
@@
-50,6
+50,7
@@
#include <linux/debugfs.h>
#include <linux/random.h>
#include <linux/ieee80211.h>
#include <linux/debugfs.h>
#include <linux/random.h>
#include <linux/ieee80211.h>
+#include <linux/slab.h>
#include <net/mac80211.h>
#include "rate.h"
#include "rc80211_minstrel.h"
#include <net/mac80211.h>
#include "rate.h"
#include "rc80211_minstrel.h"
@@
-541,7
+542,7
@@
minstrel_free(void *priv)
kfree(priv);
}
kfree(priv);
}
-st
atic st
ruct rate_control_ops mac80211_minstrel = {
+struct rate_control_ops mac80211_minstrel = {
.name = "minstrel",
.tx_status = minstrel_tx_status,
.get_rate = minstrel_get_rate,
.name = "minstrel",
.tx_status = minstrel_tx_status,
.get_rate = minstrel_get_rate,