aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-29 01:41:32 -0700
committerDavid S. Miller <davem@davemloft.net>2009-05-29 01:41:32 -0700
commit3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148 (patch)
tree785e5d697e9c2e4b8fd012a7e9c8aac263c186a5 /include
parentdfe9a837987aacaffbce020fbf54d8e0afa4bde1 (diff)
parent7481806dcfd07e9a636155554f6f4b4fbd976381 (diff)
downloadmrst-s0i3-test-3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148.tar.gz
mrst-s0i3-test-3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148.tar.xz
mrst-s0i3-test-3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148.zip
Merge branch 'linux-2.6.31.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'include')
-rw-r--r--include/linux/wimax.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/wimax.h b/include/linux/wimax.h
index c89de7f4e5b..4fdcc563551 100644
--- a/include/linux/wimax.h
+++ b/include/linux/wimax.h
@@ -59,7 +59,7 @@ enum {
* M - Major: change if removing or modifying an existing call.
* m - minor: change when adding a new call
*/
- WIMAX_GNL_VERSION = 00,
+ WIMAX_GNL_VERSION = 01,
/* Generic NetLink attributes */
WIMAX_GNL_ATTR_INVALID = 0x00,
WIMAX_GNL_ATTR_MAX = 10,
@@ -78,6 +78,7 @@ enum {
WIMAX_GNL_OP_RFKILL, /* Run wimax_rfkill() */
WIMAX_GNL_OP_RESET, /* Run wimax_rfkill() */
WIMAX_GNL_RE_STATE_CHANGE, /* Report: status change */
+ WIMAX_GNL_OP_STATE_GET, /* Request for current state */
};
@@ -113,6 +114,10 @@ enum {
WIMAX_GNL_RESET_IFIDX = 1,
};
+/* Atributes for wimax_state_get() */
+enum {
+ WIMAX_GNL_STGET_IFIDX = 1,
+};
/*
* Attributes for the Report State Change