diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2012-08-17 00:00:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-20 05:40:48 -0400 |
| commit | 1d76efe1577b4323609b1bcbfafa8b731eda071a (patch) | |
| tree | ddf6fddeee02ad33f304dd5479f57208245a3f88 /include/linux | |
| parent | 4c6de2fedc321e17487b74547ad9f73f248faaac (diff) | |
team: add support for non-ethernet devices
This is resolved by two things:
1) allow dev_addr of different length than ETH_ALEN
2) during port add, check for dev->type and change it if necessary
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_team.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/if_team.h b/include/linux/if_team.h index 33fcc20b5881..8b000b295730 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h | |||
| @@ -123,7 +123,7 @@ struct team_mode_ops { | |||
| 123 | bool (*transmit)(struct team *team, struct sk_buff *skb); | 123 | bool (*transmit)(struct team *team, struct sk_buff *skb); |
| 124 | int (*port_enter)(struct team *team, struct team_port *port); | 124 | int (*port_enter)(struct team *team, struct team_port *port); |
| 125 | void (*port_leave)(struct team *team, struct team_port *port); | 125 | void (*port_leave)(struct team *team, struct team_port *port); |
| 126 | void (*port_change_mac)(struct team *team, struct team_port *port); | 126 | void (*port_change_dev_addr)(struct team *team, struct team_port *port); |
| 127 | void (*port_enabled)(struct team *team, struct team_port *port); | 127 | void (*port_enabled)(struct team *team, struct team_port *port); |
| 128 | void (*port_disabled)(struct team *team, struct team_port *port); | 128 | void (*port_disabled)(struct team *team, struct team_port *port); |
| 129 | }; | 129 | }; |
| @@ -238,7 +238,7 @@ static inline struct team_port *team_get_port_by_index_rcu(struct team *team, | |||
| 238 | return NULL; | 238 | return NULL; |
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | extern int team_port_set_team_mac(struct team_port *port); | 241 | extern int team_port_set_team_dev_addr(struct team_port *port); |
| 242 | extern int team_options_register(struct team *team, | 242 | extern int team_options_register(struct team *team, |
| 243 | const struct team_option *option, | 243 | const struct team_option *option, |
| 244 | size_t option_count); | 244 | size_t option_count); |
