diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2012-06-19 05:54:05 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-19 15:00:22 -0700 |
| commit | 5149ee58385bdfef260fb07a89a8ff0913be6b25 (patch) | |
| tree | 556edbb864cff154dfef95858737fd900f6e9a24 | |
| parent | d299cd51166c156c77250f4cdd6363b74fd2f77e (diff) | |
| download | op-kernel-dev-5149ee58385bdfef260fb07a89a8ff0913be6b25.zip op-kernel-dev-5149ee58385bdfef260fb07a89a8ff0913be6b25.tar.gz | |
team: add mode priv to port
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/team/team.c | 3 | ||||
| -rw-r--r-- | include/linux/if_team.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 343f4ff..dea2d8a 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -793,7 +793,8 @@ static int team_port_add(struct team *team, struct net_device *port_dev) return -EBUSY; } - port = kzalloc(sizeof(struct team_port), GFP_KERNEL); + port = kzalloc(sizeof(struct team_port) + team->mode->port_priv_size, + GFP_KERNEL); if (!port) return -ENOMEM; diff --git a/include/linux/if_team.h b/include/linux/if_team.h index d45fcd5..54af95f 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h @@ -61,6 +61,7 @@ struct team_port { } orig; struct rcu_head rcu; + long mode_priv[0]; }; struct team_mode_ops { @@ -108,6 +109,7 @@ struct team_mode { const char *kind; struct module *owner; size_t priv_size; + size_t port_priv_size; const struct team_mode_ops *ops; }; |
