diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
| commit | 5e2aa2ed08e2e280121dc7cf5609c87d464f12ef (patch) | |
| tree | ca7d7b1480285e3b617fecc5b41f0ce150a82c32 /include/linux/if_team.h | |
| parent | f62d14a8072b9756db36ba394e2b267470a40240 (diff) | |
| parent | fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.17.
Diffstat (limited to 'include/linux/if_team.h')
| -rw-r--r-- | include/linux/if_team.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_team.h b/include/linux/if_team.h index a899dc24be15..a6aa970758a2 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h | |||
| @@ -194,6 +194,7 @@ struct team { | |||
| 194 | bool user_carrier_enabled; | 194 | bool user_carrier_enabled; |
| 195 | bool queue_override_enabled; | 195 | bool queue_override_enabled; |
| 196 | struct list_head *qom_lists; /* array of queue override mapping lists */ | 196 | struct list_head *qom_lists; /* array of queue override mapping lists */ |
| 197 | bool port_mtu_change_allowed; | ||
| 197 | struct { | 198 | struct { |
| 198 | unsigned int count; | 199 | unsigned int count; |
| 199 | unsigned int interval; /* in ms */ | 200 | unsigned int interval; /* in ms */ |