Replace NL80211_ATTR_IFACE_SOCKET_OWNER attribute with more generic NL80211_ATTR_SOCKET_OWNER that can be used with other commands that interface creation.
Unified · Split
| @@ -1652,9 +1652,9 @@ enum nl80211_commands { · 1651 unmodified lines | ||
| 1652 | 1652 | * @NL80211_ATTR_TDLS_PEER_CAPABILITY: flags for TDLS peer capabilities, u32. |
| 1653 | 1653 | * As specified in the &enum nl80211_tdls_peer_capability. |
| 1654 | 1654 | * |
| 1655 | − * @NL80211_ATTR_IFACE_SOCKET_OWNER: flag attribute, if set during interface | |
| 1655 | + * @NL80211_ATTR_SOCKET_OWNER: Flag attribute, if set during interface | |
| 1656 | 1656 | * creation then the new interface will be owned by the netlink socket |
| 1657 | − * that created it and will be destroyed when the socket is closed | |
| 1657 | + * that created it and will be destroyed when the socket is closed. | |
| 1658 | 1658 | * |
| 1659 | 1659 | * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is |
| 1660 | 1660 | * the TDLS link initiator. |
| @@ -2024,7 +2024,7 @@ enum nl80211_attrs { · 363 unmodified lines | ||
| 2024 | 2024 | |
| 2025 | 2025 | NL80211_ATTR_TDLS_PEER_CAPABILITY, |
| 2026 | 2026 | |
| 2027 | − NL80211_ATTR_IFACE_SOCKET_OWNER, | |
| 2027 | + NL80211_ATTR_SOCKET_OWNER, | |
| 2028 | 2028 | |
| 2029 | 2029 | NL80211_ATTR_CSA_C_OFFSETS_TX, |
| 2030 | 2030 | NL80211_ATTR_MAX_CSA_COUNTERS, |
| @@ -2055,6 +2055,7 @@ enum nl80211_attrs { · 24 unmodified lines | ||
| 2055 | 2055 | /* source-level API compatibility */ |
| 2056 | 2056 | #define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION |
| 2057 | 2057 | #define NL80211_ATTR_MESH_PARAMS NL80211_ATTR_MESH_CONFIG |
| 2058 | +#define NL80211_ATTR_IFACE_SOCKET_OWNER NL80211_ATTR_SOCKET_OWNER | |
| 2058 | 2059 | |
| 2059 | 2060 | /* |
| 2060 | 2061 | * Allow user space programs to use #ifdef on new attributes by defining them |
| @@ -388,7 +388,7 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { · 387 unmodified lines | ||
| 388 | 388 | [NL80211_ATTR_MAC_HINT] = { .len = ETH_ALEN }, |
| 389 | 389 | [NL80211_ATTR_WIPHY_FREQ_HINT] = { .type = NLA_U32 }, |
| 390 | 390 | [NL80211_ATTR_TDLS_PEER_CAPABILITY] = { .type = NLA_U32 }, |
| 391 | − [NL80211_ATTR_IFACE_SOCKET_OWNER] = { .type = NLA_FLAG }, | |
| 391 | + [NL80211_ATTR_SOCKET_OWNER] = { .type = NLA_FLAG }, | |
| 392 | 392 | [NL80211_ATTR_CSA_C_OFFSETS_TX] = { .type = NLA_BINARY }, |
| 393 | 393 | [NL80211_ATTR_USE_RRM] = { .type = NLA_FLAG }, |
| 394 | 394 | [NL80211_ATTR_TSID] = { .type = NLA_U8 }, |
| @@ -2653,7 +2653,7 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info) · 2258 unmodified lines | ||
| 2653 | 2653 | return PTR_ERR(wdev); |
| 2654 | 2654 | } |
| 2655 | 2655 | |
| 2656 | − if (info->attrs[NL80211_ATTR_IFACE_SOCKET_OWNER]) | |
| 2656 | + if (info->attrs[NL80211_ATTR_SOCKET_OWNER]) | |
| 2657 | 2657 | wdev->owner_nlportid = info->snd_portid; |
| 2658 | 2658 | |
| 2659 | 2659 | switch (type) { |