]> err.no Git - linux-2.6/commitdiff
nl80211: Fix comment merge error
authorMichael Buesch <mb@bu3sch.de>
Tue, 10 Jun 2008 12:04:14 +0000 (14:04 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Sat, 14 Jun 2008 16:18:01 +0000 (12:18 -0400)
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>
include/linux/nl80211.h

index ea6517e58b04d74dddb1ab9db6fc06406e166dd3..aa8411e2a1606fc9fbf2f8869e5f233885d3e56a 100644 (file)
@@ -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
 };