Commit 564d9bdd authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

nl80211: Fix comment merge error 



The comments ended up in the wrong place due to a merge error.

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4f85f5b3

include/linux/nl80211.h

+4 −4
Original line number Diff line number Diff line
@@ -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

};