diff options
author | Rui Paulo <rpaulo@gmail.com> | 2009-11-09 18:46:55 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-13 17:43:56 -0500 |
commit | d19b3bf6384e66ac6e11a61ee31ed2cfe149f4d8 (patch) | |
tree | 2ec825639458dafddecc7e3d0f83afff9cff0cfa /include | |
parent | be125c60e46e165fbfe33db36a4a9d943d560a5b (diff) |
mac80211: replace "destination" with "target" to follow the spec
Resulting object files have the same MD5 as before.
Signed-off-by: Rui Paulo <rpaulo@gmail.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Reviewed-by: Andrey Yurovsky <andrey@cozybit.com>
Tested-by: Brian Cavagnolo <brian@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nl80211.h | 8 | ||||
-rw-r--r-- | include/net/cfg80211.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index 203adef972cf..7a0bd6ea6f63 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h | |||
@@ -899,14 +899,14 @@ enum nl80211_sta_info { | |||
899 | * | 899 | * |
900 | * @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active | 900 | * @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active |
901 | * @NL80211_MPATH_FLAG_RESOLVING: the mesh path discovery process is running | 901 | * @NL80211_MPATH_FLAG_RESOLVING: the mesh path discovery process is running |
902 | * @NL80211_MPATH_FLAG_DSN_VALID: the mesh path contains a valid DSN | 902 | * @NL80211_MPATH_FLAG_SN_VALID: the mesh path contains a valid SN |
903 | * @NL80211_MPATH_FLAG_FIXED: the mesh path has been manually set | 903 | * @NL80211_MPATH_FLAG_FIXED: the mesh path has been manually set |
904 | * @NL80211_MPATH_FLAG_RESOLVED: the mesh path discovery process succeeded | 904 | * @NL80211_MPATH_FLAG_RESOLVED: the mesh path discovery process succeeded |
905 | */ | 905 | */ |
906 | enum nl80211_mpath_flags { | 906 | enum nl80211_mpath_flags { |
907 | NL80211_MPATH_FLAG_ACTIVE = 1<<0, | 907 | NL80211_MPATH_FLAG_ACTIVE = 1<<0, |
908 | NL80211_MPATH_FLAG_RESOLVING = 1<<1, | 908 | NL80211_MPATH_FLAG_RESOLVING = 1<<1, |
909 | NL80211_MPATH_FLAG_DSN_VALID = 1<<2, | 909 | NL80211_MPATH_FLAG_SN_VALID = 1<<2, |
910 | NL80211_MPATH_FLAG_FIXED = 1<<3, | 910 | NL80211_MPATH_FLAG_FIXED = 1<<3, |
911 | NL80211_MPATH_FLAG_RESOLVED = 1<<4, | 911 | NL80211_MPATH_FLAG_RESOLVED = 1<<4, |
912 | }; | 912 | }; |
@@ -919,7 +919,7 @@ enum nl80211_mpath_flags { | |||
919 | * | 919 | * |
920 | * @__NL80211_MPATH_INFO_INVALID: attribute number 0 is reserved | 920 | * @__NL80211_MPATH_INFO_INVALID: attribute number 0 is reserved |
921 | * @NL80211_ATTR_MPATH_FRAME_QLEN: number of queued frames for this destination | 921 | * @NL80211_ATTR_MPATH_FRAME_QLEN: number of queued frames for this destination |
922 | * @NL80211_ATTR_MPATH_DSN: destination sequence number | 922 | * @NL80211_ATTR_MPATH_SN: destination sequence number |
923 | * @NL80211_ATTR_MPATH_METRIC: metric (cost) of this mesh path | 923 | * @NL80211_ATTR_MPATH_METRIC: metric (cost) of this mesh path |
924 | * @NL80211_ATTR_MPATH_EXPTIME: expiration time for the path, in msec from now | 924 | * @NL80211_ATTR_MPATH_EXPTIME: expiration time for the path, in msec from now |
925 | * @NL80211_ATTR_MPATH_FLAGS: mesh path flags, enumerated in | 925 | * @NL80211_ATTR_MPATH_FLAGS: mesh path flags, enumerated in |
@@ -930,7 +930,7 @@ enum nl80211_mpath_flags { | |||
930 | enum nl80211_mpath_info { | 930 | enum nl80211_mpath_info { |
931 | __NL80211_MPATH_INFO_INVALID, | 931 | __NL80211_MPATH_INFO_INVALID, |
932 | NL80211_MPATH_INFO_FRAME_QLEN, | 932 | NL80211_MPATH_INFO_FRAME_QLEN, |
933 | NL80211_MPATH_INFO_DSN, | 933 | NL80211_MPATH_INFO_SN, |
934 | NL80211_MPATH_INFO_METRIC, | 934 | NL80211_MPATH_INFO_METRIC, |
935 | NL80211_MPATH_INFO_EXPTIME, | 935 | NL80211_MPATH_INFO_EXPTIME, |
936 | NL80211_MPATH_INFO_FLAGS, | 936 | NL80211_MPATH_INFO_FLAGS, |
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 1ee41e4a92e2..7d0ae9c18286 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -420,7 +420,7 @@ enum monitor_flags { | |||
420 | * in during get_station() or dump_station(). | 420 | * in during get_station() or dump_station(). |
421 | * | 421 | * |
422 | * MPATH_INFO_FRAME_QLEN: @frame_qlen filled | 422 | * MPATH_INFO_FRAME_QLEN: @frame_qlen filled |
423 | * MPATH_INFO_DSN: @dsn filled | 423 | * MPATH_INFO_SN: @sn filled |
424 | * MPATH_INFO_METRIC: @metric filled | 424 | * MPATH_INFO_METRIC: @metric filled |
425 | * MPATH_INFO_EXPTIME: @exptime filled | 425 | * MPATH_INFO_EXPTIME: @exptime filled |
426 | * MPATH_INFO_DISCOVERY_TIMEOUT: @discovery_timeout filled | 426 | * MPATH_INFO_DISCOVERY_TIMEOUT: @discovery_timeout filled |
@@ -429,7 +429,7 @@ enum monitor_flags { | |||
429 | */ | 429 | */ |
430 | enum mpath_info_flags { | 430 | enum mpath_info_flags { |
431 | MPATH_INFO_FRAME_QLEN = BIT(0), | 431 | MPATH_INFO_FRAME_QLEN = BIT(0), |
432 | MPATH_INFO_DSN = BIT(1), | 432 | MPATH_INFO_SN = BIT(1), |
433 | MPATH_INFO_METRIC = BIT(2), | 433 | MPATH_INFO_METRIC = BIT(2), |
434 | MPATH_INFO_EXPTIME = BIT(3), | 434 | MPATH_INFO_EXPTIME = BIT(3), |
435 | MPATH_INFO_DISCOVERY_TIMEOUT = BIT(4), | 435 | MPATH_INFO_DISCOVERY_TIMEOUT = BIT(4), |
@@ -444,7 +444,7 @@ enum mpath_info_flags { | |||
444 | * | 444 | * |
445 | * @filled: bitfield of flags from &enum mpath_info_flags | 445 | * @filled: bitfield of flags from &enum mpath_info_flags |
446 | * @frame_qlen: number of queued frames for this destination | 446 | * @frame_qlen: number of queued frames for this destination |
447 | * @dsn: destination sequence number | 447 | * @sn: target sequence number |
448 | * @metric: metric (cost) of this mesh path | 448 | * @metric: metric (cost) of this mesh path |
449 | * @exptime: expiration time for the mesh path from now, in msecs | 449 | * @exptime: expiration time for the mesh path from now, in msecs |
450 | * @flags: mesh path flags | 450 | * @flags: mesh path flags |
@@ -458,7 +458,7 @@ enum mpath_info_flags { | |||
458 | struct mpath_info { | 458 | struct mpath_info { |
459 | u32 filled; | 459 | u32 filled; |
460 | u32 frame_qlen; | 460 | u32 frame_qlen; |
461 | u32 dsn; | 461 | u32 sn; |
462 | u32 metric; | 462 | u32 metric; |
463 | u32 exptime; | 463 | u32 exptime; |
464 | u32 discovery_timeout; | 464 | u32 discovery_timeout; |