Skip to content

Commit

Permalink
nl80211: Fix comment merge error
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Buesch authored and John W. Linville committed Jun 14, 2008
1 parent 4f85f5b commit 564d9bd
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions include/linux/nl80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
};
Expand Down

0 comments on commit 564d9bd

Please sign in to comment.