diff options
| author | Michael Buesch <mb@bu3sch.de> | 2008-06-10 14:04:14 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-06-14 12:18:01 -0400 |
| commit | 564d9bdd89df4ceece5d126ff3b7db506ae06548 (patch) | |
| tree | ce76db33c510abc9dfb261d4929805b80462bf41 /include/linux/nl80211.h | |
| parent | 4f85f5b39208e755a93f63296ec1224d14121b6c (diff) | |
| download | op-kernel-dev-564d9bdd89df4ceece5d126ff3b7db506ae06548.zip op-kernel-dev-564d9bdd89df4ceece5d126ff3b7db506ae06548.tar.gz | |
nl80211: Fix comment merge error
The comments ended up in the wrong place due to a merge error.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/nl80211.h')
| -rw-r--r-- | include/linux/nl80211.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index ea6517e..aa8411e 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h @@ -122,13 +122,13 @@ enum nl80211_commands { NL80211_CMD_NEW_STATION, NL80211_CMD_DEL_STATION, - /* add commands here */ - NL80211_CMD_GET_MPATH, NL80211_CMD_SET_MPATH, NL80211_CMD_NEW_MPATH, NL80211_CMD_DEL_MPATH, + /* add commands here */ + /* used to define NL80211_CMD_MAX below */ __NL80211_CMD_AFTER_LAST, NL80211_CMD_MAX = __NL80211_CMD_AFTER_LAST - 1 @@ -230,13 +230,13 @@ enum nl80211_attrs { NL80211_ATTR_MNTR_FLAGS, - /* add attributes here, update the policy in nl80211.c */ - NL80211_ATTR_MESH_ID, NL80211_ATTR_STA_PLINK_ACTION, NL80211_ATTR_MPATH_NEXT_HOP, NL80211_ATTR_MPATH_INFO, + /* add attributes here, update the policy in nl80211.c */ + __NL80211_ATTR_AFTER_LAST, NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1 }; |
