diff options
author | Felix Fietkau <nbd@openwrt.org> | 2009-11-10 12:53:10 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-11 17:02:07 -0500 |
commit | 8b787643ca0a5130c647109d77fe512f89cfa611 (patch) | |
tree | b3b0f74c57843a90f8a3822d37237d637c8dcfd0 /include | |
parent | 1460dd158a520447b87661aea4afda1997d69cde (diff) |
nl80211: add a parameter for using 4-address frames on virtual interfaces
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nl80211.h | 4 | ||||
-rw-r--r-- | include/net/cfg80211.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index 50afca3dcff1..203adef972cf 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h | |||
@@ -584,6 +584,8 @@ enum nl80211_commands { | |||
584 | * changed then the list changed and the dump should be repeated | 584 | * changed then the list changed and the dump should be repeated |
585 | * completely from scratch. | 585 | * completely from scratch. |
586 | * | 586 | * |
587 | * @NL80211_ATTR_4ADDR: Use 4-address frames on a virtual interface | ||
588 | * | ||
587 | * @NL80211_ATTR_MAX: highest attribute number currently defined | 589 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
588 | * @__NL80211_ATTR_AFTER_LAST: internal use | 590 | * @__NL80211_ATTR_AFTER_LAST: internal use |
589 | */ | 591 | */ |
@@ -714,6 +716,8 @@ enum nl80211_attrs { | |||
714 | 716 | ||
715 | NL80211_ATTR_PID, | 717 | NL80211_ATTR_PID, |
716 | 718 | ||
719 | NL80211_ATTR_4ADDR, | ||
720 | |||
717 | /* add attributes here, update the policy in nl80211.c */ | 721 | /* add attributes here, update the policy in nl80211.c */ |
718 | 722 | ||
719 | __NL80211_ATTR_AFTER_LAST, | 723 | __NL80211_ATTR_AFTER_LAST, |
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index ff67865de231..1ee41e4a92e2 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -206,10 +206,12 @@ struct ieee80211_supported_band { | |||
206 | * struct vif_params - describes virtual interface parameters | 206 | * struct vif_params - describes virtual interface parameters |
207 | * @mesh_id: mesh ID to use | 207 | * @mesh_id: mesh ID to use |
208 | * @mesh_id_len: length of the mesh ID | 208 | * @mesh_id_len: length of the mesh ID |
209 | * @use_4addr: use 4-address frames | ||
209 | */ | 210 | */ |
210 | struct vif_params { | 211 | struct vif_params { |
211 | u8 *mesh_id; | 212 | u8 *mesh_id; |
212 | int mesh_id_len; | 213 | int mesh_id_len; |
214 | int use_4addr; | ||
213 | }; | 215 | }; |
214 | 216 | ||
215 | /** | 217 | /** |