summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kilroy <kilroyd@googlemail.com>2009-05-16 23:13:46 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-05-20 14:46:27 -0400
commit3dcf670baf3d3a9bfc752e59d0b1a8d886230750 (patch)
tree843e1fbcfb9d2e62fbd7b419e7b8bf80b494cc61
parentc15ff610453a6daa708f32b1c00b8344d3a462dd (diff)
cfg80211: mark ops as pointer to const
This allows drivers to mark their cfg80211_ops tables const. Signed-off-by: David Kilroy <kilroyd@googlemail.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--include/net/cfg80211.h2
-rw-r--r--net/wireless/core.c2
-rw-r--r--net/wireless/core.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 7391ad10c8c0..09a823520e58 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1073,7 +1073,7 @@ static inline const char *wiphy_name(struct wiphy *wiphy)
* The returned pointer must be assigned to each netdev's
* ieee80211_ptr for proper operation.
*/
-struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv);
+struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv);
/**
* wiphy_register - register a wiphy with cfg80211
diff --git a/net/wireless/core.c b/net/wireless/core.c
index b6ef5337c85f..a5dbea1da476 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -229,7 +229,7 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
/* exported functions */
-struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv)
+struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv)
{
static int wiphy_counter;
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 88f234c8f6b3..9511c2be83d8 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -16,7 +16,7 @@
#include "reg.h"
struct cfg80211_registered_device {
- struct cfg80211_ops *ops;
+ const struct cfg80211_ops *ops;
struct list_head list;
/* we hold this mutex during any call so that
* we cannot do multiple calls at once, and also