diff options
| author | Tim Gardner | 2011-08-08 11:49:49 -0500 |
|---|---|---|
| committer | Luis R. Rodriguez | 2011-08-09 18:36:19 -0500 |
| commit | c1b10e69fc8ab3209313d5189a08e335afa0c752 (patch) | |
| tree | 00082a7a701f3a17447331c5e0c666fc68ca54f5 /crda.c | |
| parent | 52300e7ed595cc15305fbfbc28c6ee146ceff1ee (diff) | |
| download | crda-c1b10e69fc8ab3209313d5189a08e335afa0c752.tar.gz crda-c1b10e69fc8ab3209313d5189a08e335afa0c752.tar.xz crda-c1b10e69fc8ab3209313d5189a08e335afa0c752.zip | |
crda: add nested support for libnl-3.0v1.1.2
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'crda.c')
| -rw-r--r-- | crda.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -21,7 +21,7 @@ | |||
| 21 | #include "regdb.h" | 21 | #include "regdb.h" |
| 22 | #include "reglib.h" | 22 | #include "reglib.h" |
| 23 | 23 | ||
| 24 | #ifndef CONFIG_LIBNL20 | 24 | #if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30) |
| 25 | /* libnl 2.0 compatibility code */ | 25 | /* libnl 2.0 compatibility code */ |
| 26 | static inline struct nl_handle *nl_socket_alloc(void) | 26 | static inline struct nl_handle *nl_socket_alloc(void) |
| 27 | { | 27 | { |
| @@ -44,7 +44,7 @@ static inline int __genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache * | |||
| 44 | 44 | ||
| 45 | #define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache | 45 | #define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache |
| 46 | #define nl_sock nl_handle | 46 | #define nl_sock nl_handle |
| 47 | #endif /* CONFIG_LIBNL20 */ | 47 | #endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 */ |
| 48 | 48 | ||
| 49 | struct nl80211_state { | 49 | struct nl80211_state { |
| 50 | struct nl_sock *nl_sock; | 50 | struct nl_sock *nl_sock; |