diff options
author | Chun-Yeow Yeoh <yeohchunyeow@gmail.com> | 2012-06-10 23:59:36 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-11 03:23:45 -0400 |
commit | a4f606ea73d56d15f28653d2242e54d58bb612e5 (patch) | |
tree | f885d00931cb33a5da5f4ac391bc6d8e521e456f /net/mac80211 | |
parent | 3ddd53f392c4f8e19e1110d1bdef770008b128b8 (diff) |
{nl,cfg,mac}80211: fix the coding style related to mesh parameters
fix the coding style related to mesh parameters, especially the indentation,
as pointed out by Johannes Berg.
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/cfg.c | 3 | ||||
-rw-r--r-- | net/mac80211/debugfs_netdev.c | 34 |
2 files changed, 18 insertions, 19 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 498c94e34427..f41f9bea242a 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -1571,10 +1571,9 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy, | |||
1571 | conf->dot11MeshGateAnnouncementProtocol = | 1571 | conf->dot11MeshGateAnnouncementProtocol = |
1572 | nconf->dot11MeshGateAnnouncementProtocol; | 1572 | nconf->dot11MeshGateAnnouncementProtocol; |
1573 | } | 1573 | } |
1574 | if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask)) { | 1574 | if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask)) |
1575 | conf->dot11MeshHWMPRannInterval = | 1575 | conf->dot11MeshHWMPRannInterval = |
1576 | nconf->dot11MeshHWMPRannInterval; | 1576 | nconf->dot11MeshHWMPRannInterval; |
1577 | } | ||
1578 | if (_chg_mesh_attr(NL80211_MESHCONF_FORWARDING, mask)) | 1577 | if (_chg_mesh_attr(NL80211_MESHCONF_FORWARDING, mask)) |
1579 | conf->dot11MeshForwarding = nconf->dot11MeshForwarding; | 1578 | conf->dot11MeshForwarding = nconf->dot11MeshForwarding; |
1580 | if (_chg_mesh_attr(NL80211_MESHCONF_RSSI_THRESHOLD, mask)) { | 1579 | if (_chg_mesh_attr(NL80211_MESHCONF_RSSI_THRESHOLD, mask)) { |
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c index d4272ff43f71..c429417e1322 100644 --- a/net/mac80211/debugfs_netdev.c +++ b/net/mac80211/debugfs_netdev.c | |||
@@ -468,45 +468,45 @@ IEEE80211_IF_FILE(fwded_unicast, u.mesh.mshstats.fwded_unicast, DEC); | |||
468 | IEEE80211_IF_FILE(fwded_frames, u.mesh.mshstats.fwded_frames, DEC); | 468 | IEEE80211_IF_FILE(fwded_frames, u.mesh.mshstats.fwded_frames, DEC); |
469 | IEEE80211_IF_FILE(dropped_frames_ttl, u.mesh.mshstats.dropped_frames_ttl, DEC); | 469 | IEEE80211_IF_FILE(dropped_frames_ttl, u.mesh.mshstats.dropped_frames_ttl, DEC); |
470 | IEEE80211_IF_FILE(dropped_frames_congestion, | 470 | IEEE80211_IF_FILE(dropped_frames_congestion, |
471 | u.mesh.mshstats.dropped_frames_congestion, DEC); | 471 | u.mesh.mshstats.dropped_frames_congestion, DEC); |
472 | IEEE80211_IF_FILE(dropped_frames_no_route, | 472 | IEEE80211_IF_FILE(dropped_frames_no_route, |
473 | u.mesh.mshstats.dropped_frames_no_route, DEC); | 473 | u.mesh.mshstats.dropped_frames_no_route, DEC); |
474 | IEEE80211_IF_FILE(estab_plinks, u.mesh.mshstats.estab_plinks, ATOMIC); | 474 | IEEE80211_IF_FILE(estab_plinks, u.mesh.mshstats.estab_plinks, ATOMIC); |
475 | 475 | ||
476 | /* Mesh parameters */ | 476 | /* Mesh parameters */ |
477 | IEEE80211_IF_FILE(dot11MeshMaxRetries, | 477 | IEEE80211_IF_FILE(dot11MeshMaxRetries, |
478 | u.mesh.mshcfg.dot11MeshMaxRetries, DEC); | 478 | u.mesh.mshcfg.dot11MeshMaxRetries, DEC); |
479 | IEEE80211_IF_FILE(dot11MeshRetryTimeout, | 479 | IEEE80211_IF_FILE(dot11MeshRetryTimeout, |
480 | u.mesh.mshcfg.dot11MeshRetryTimeout, DEC); | 480 | u.mesh.mshcfg.dot11MeshRetryTimeout, DEC); |
481 | IEEE80211_IF_FILE(dot11MeshConfirmTimeout, | 481 | IEEE80211_IF_FILE(dot11MeshConfirmTimeout, |
482 | u.mesh.mshcfg.dot11MeshConfirmTimeout, DEC); | 482 | u.mesh.mshcfg.dot11MeshConfirmTimeout, DEC); |
483 | IEEE80211_IF_FILE(dot11MeshHoldingTimeout, | 483 | IEEE80211_IF_FILE(dot11MeshHoldingTimeout, |
484 | u.mesh.mshcfg.dot11MeshHoldingTimeout, DEC); | 484 | u.mesh.mshcfg.dot11MeshHoldingTimeout, DEC); |
485 | IEEE80211_IF_FILE(dot11MeshTTL, u.mesh.mshcfg.dot11MeshTTL, DEC); | 485 | IEEE80211_IF_FILE(dot11MeshTTL, u.mesh.mshcfg.dot11MeshTTL, DEC); |
486 | IEEE80211_IF_FILE(element_ttl, u.mesh.mshcfg.element_ttl, DEC); | 486 | IEEE80211_IF_FILE(element_ttl, u.mesh.mshcfg.element_ttl, DEC); |
487 | IEEE80211_IF_FILE(auto_open_plinks, u.mesh.mshcfg.auto_open_plinks, DEC); | 487 | IEEE80211_IF_FILE(auto_open_plinks, u.mesh.mshcfg.auto_open_plinks, DEC); |
488 | IEEE80211_IF_FILE(dot11MeshMaxPeerLinks, | 488 | IEEE80211_IF_FILE(dot11MeshMaxPeerLinks, |
489 | u.mesh.mshcfg.dot11MeshMaxPeerLinks, DEC); | 489 | u.mesh.mshcfg.dot11MeshMaxPeerLinks, DEC); |
490 | IEEE80211_IF_FILE(dot11MeshHWMPactivePathTimeout, | 490 | IEEE80211_IF_FILE(dot11MeshHWMPactivePathTimeout, |
491 | u.mesh.mshcfg.dot11MeshHWMPactivePathTimeout, DEC); | 491 | u.mesh.mshcfg.dot11MeshHWMPactivePathTimeout, DEC); |
492 | IEEE80211_IF_FILE(dot11MeshHWMPpreqMinInterval, | 492 | IEEE80211_IF_FILE(dot11MeshHWMPpreqMinInterval, |
493 | u.mesh.mshcfg.dot11MeshHWMPpreqMinInterval, DEC); | 493 | u.mesh.mshcfg.dot11MeshHWMPpreqMinInterval, DEC); |
494 | IEEE80211_IF_FILE(dot11MeshHWMPperrMinInterval, | 494 | IEEE80211_IF_FILE(dot11MeshHWMPperrMinInterval, |
495 | u.mesh.mshcfg.dot11MeshHWMPperrMinInterval, DEC); | 495 | u.mesh.mshcfg.dot11MeshHWMPperrMinInterval, DEC); |
496 | IEEE80211_IF_FILE(dot11MeshHWMPnetDiameterTraversalTime, | 496 | IEEE80211_IF_FILE(dot11MeshHWMPnetDiameterTraversalTime, |
497 | u.mesh.mshcfg.dot11MeshHWMPnetDiameterTraversalTime, DEC); | 497 | u.mesh.mshcfg.dot11MeshHWMPnetDiameterTraversalTime, DEC); |
498 | IEEE80211_IF_FILE(dot11MeshHWMPmaxPREQretries, | 498 | IEEE80211_IF_FILE(dot11MeshHWMPmaxPREQretries, |
499 | u.mesh.mshcfg.dot11MeshHWMPmaxPREQretries, DEC); | 499 | u.mesh.mshcfg.dot11MeshHWMPmaxPREQretries, DEC); |
500 | IEEE80211_IF_FILE(path_refresh_time, | 500 | IEEE80211_IF_FILE(path_refresh_time, |
501 | u.mesh.mshcfg.path_refresh_time, DEC); | 501 | u.mesh.mshcfg.path_refresh_time, DEC); |
502 | IEEE80211_IF_FILE(min_discovery_timeout, | 502 | IEEE80211_IF_FILE(min_discovery_timeout, |
503 | u.mesh.mshcfg.min_discovery_timeout, DEC); | 503 | u.mesh.mshcfg.min_discovery_timeout, DEC); |
504 | IEEE80211_IF_FILE(dot11MeshHWMPRootMode, | 504 | IEEE80211_IF_FILE(dot11MeshHWMPRootMode, |
505 | u.mesh.mshcfg.dot11MeshHWMPRootMode, DEC); | 505 | u.mesh.mshcfg.dot11MeshHWMPRootMode, DEC); |
506 | IEEE80211_IF_FILE(dot11MeshGateAnnouncementProtocol, | 506 | IEEE80211_IF_FILE(dot11MeshGateAnnouncementProtocol, |
507 | u.mesh.mshcfg.dot11MeshGateAnnouncementProtocol, DEC); | 507 | u.mesh.mshcfg.dot11MeshGateAnnouncementProtocol, DEC); |
508 | IEEE80211_IF_FILE(dot11MeshHWMPRannInterval, | 508 | IEEE80211_IF_FILE(dot11MeshHWMPRannInterval, |
509 | u.mesh.mshcfg.dot11MeshHWMPRannInterval, DEC); | 509 | u.mesh.mshcfg.dot11MeshHWMPRannInterval, DEC); |
510 | IEEE80211_IF_FILE(dot11MeshForwarding, u.mesh.mshcfg.dot11MeshForwarding, DEC); | 510 | IEEE80211_IF_FILE(dot11MeshForwarding, u.mesh.mshcfg.dot11MeshForwarding, DEC); |
511 | IEEE80211_IF_FILE(rssi_threshold, u.mesh.mshcfg.rssi_threshold, DEC); | 511 | IEEE80211_IF_FILE(rssi_threshold, u.mesh.mshcfg.rssi_threshold, DEC); |
512 | IEEE80211_IF_FILE(ht_opmode, u.mesh.mshcfg.ht_opmode, DEC); | 512 | IEEE80211_IF_FILE(ht_opmode, u.mesh.mshcfg.ht_opmode, DEC); |