Merge branch 'linux-2.6.31.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax

1 files changed, 4 insertions, 1 deletions

diff --git a/net/wimax/stack.c b/net/wimax/stack.c
index 933e1422b09..79fb7d7c640 100644
--- a/net/wimax/stack.c
+++ b/net/wimax/stack.c
@@ -402,13 +402,15 @@ EXPORT_SYMBOL_GPL(wimax_dev_init);
 extern struct genl_ops
         wimax_gnl_msg_from_user,
         wimax_gnl_reset,
-        wimax_gnl_rfkill;
+        wimax_gnl_rfkill,
+        wimax_gnl_state_get;
 
 static
 struct genl_ops *wimax_gnl_ops[] = {
         &wimax_gnl_msg_from_user,
         &wimax_gnl_reset,
         &wimax_gnl_rfkill,
+        &wimax_gnl_state_get,
 };
 
 
@@ -533,6 +535,7 @@ struct d_level D_LEVEL[] = {
         D_SUBMODULE_DEFINE(op_msg),
         D_SUBMODULE_DEFINE(op_reset),
         D_SUBMODULE_DEFINE(op_rfkill),
+        D_SUBMODULE_DEFINE(op_state_get),
         D_SUBMODULE_DEFINE(stack),
 };
 size_t D_LEVEL_SIZE = ARRAY_SIZE(D_LEVEL);