diff --git a/[refs] b/[refs] index c789178e111d..98059fcf7bc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b381fa3229a30f6d7b0e6053314c4a5378c9389d +refs/heads/master: dcca1cfc0978fa084245937ec1472b870edde97d diff --git a/trunk/include/linux/ieee80211.h b/trunk/include/linux/ieee80211.h index db84e2f6b289..ce9af8918514 100644 --- a/trunk/include/linux/ieee80211.h +++ b/trunk/include/linux/ieee80211.h @@ -1458,7 +1458,7 @@ enum { * be specified in a vendor specific information element */ enum { - IEEE80211_PATH_PROTOCOL_HWMP = 0, + IEEE80211_PATH_PROTOCOL_HWMP = 1, IEEE80211_PATH_PROTOCOL_VENDOR = 255, }; @@ -1470,7 +1470,7 @@ enum { * specified in a vendor specific information element */ enum { - IEEE80211_PATH_METRIC_AIRTIME = 0, + IEEE80211_PATH_METRIC_AIRTIME = 1, IEEE80211_PATH_METRIC_VENDOR = 255, };