diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-27 20:35:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-27 20:35:07 -0400 |
commit | 0870352bc6e0dee485c86a0c99dd60e7089c8917 (patch) | |
tree | 0c6259b663350594bff4f128e12f8bd6d4c769c1 /net/wireless/core.h | |
parent | c44a4366649aca4f5b4a51ff71d4c9cde3b7c9da (diff) | |
parent | 8a5117d80fe93de5df5b56480054f7df1fd20755 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless/core.h')
-rw-r--r-- | net/wireless/core.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index 6acd483a61f8..d43daa236ef9 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h | |||
@@ -90,6 +90,8 @@ struct cfg80211_internal_bss { | |||
90 | struct rb_node rbn; | 90 | struct rb_node rbn; |
91 | unsigned long ts; | 91 | unsigned long ts; |
92 | struct kref ref; | 92 | struct kref ref; |
93 | bool hold; | ||
94 | |||
93 | /* must be last because of priv member */ | 95 | /* must be last because of priv member */ |
94 | struct cfg80211_bss pub; | 96 | struct cfg80211_bss pub; |
95 | }; | 97 | }; |
@@ -97,6 +99,9 @@ struct cfg80211_internal_bss { | |||
97 | struct cfg80211_registered_device *cfg80211_drv_by_wiphy_idx(int wiphy_idx); | 99 | struct cfg80211_registered_device *cfg80211_drv_by_wiphy_idx(int wiphy_idx); |
98 | int get_wiphy_idx(struct wiphy *wiphy); | 100 | int get_wiphy_idx(struct wiphy *wiphy); |
99 | 101 | ||
102 | struct cfg80211_registered_device * | ||
103 | __cfg80211_drv_from_info(struct genl_info *info); | ||
104 | |||
100 | /* | 105 | /* |
101 | * This function returns a pointer to the driver | 106 | * This function returns a pointer to the driver |
102 | * that the genl_info item that is passed refers to. | 107 | * that the genl_info item that is passed refers to. |