Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1306927 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-01-12 03:20 +0100 |
| Last post | 2016-01-12 12:50 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the net-next tree with the nettree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-12 03:20 +0100
Re: linux-next: manual merge of the net-next tree with the nettree Ido Schimmel <idosch@mellanox.com> - 2016-01-12 12:50 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-01-12 03:20 +0100 |
| Subject | linux-next: manual merge of the net-next tree with the nettree |
| Message-ID | <qPWIV-2PA-7@gated-at.bofh.it> |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlxsw/spectrum.h
between commit:
366ce6031529 ("mlxsw: spectrum: Add FDB lock to prevent session interleaving")
from the net tree and commit:
0d65fc13042f ("mlxsw: spectrum: Implement LAG port join/leave")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index 69281ca534b1,199f91a62962..000000000000
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@@ -63,13 -120,16 +120,17 @@@ struct mlxsw_sp
} fdb_notify;
#define MLXSW_SP_DEFAULT_AGEING_TIME 300
u32 ageing_time;
+ struct mutex fdb_lock; /* Make sure FDB sessions are atomic. */
- struct {
- struct net_device *dev;
- unsigned int ref_count;
- } master_bridge;
+ struct mlxsw_sp_upper master_bridge;
+ struct mlxsw_sp_upper lags[MLXSW_SP_LAG_MAX];
};
+ static inline struct mlxsw_sp_upper *
+ mlxsw_sp_lag_get(struct mlxsw_sp *mlxsw_sp, u16 lag_id)
+ {
+ return &mlxsw_sp->lags[lag_id];
+ }
+
struct mlxsw_sp_port_pcpu_stats {
u64 rx_packets;
u64 rx_bytes;
[toc] | [next] | [standalone]
| From | Ido Schimmel <idosch@mellanox.com> |
|---|---|
| Date | 2016-01-12 12:50 +0100 |
| Message-ID | <qQ5Cy-jP-7@gated-at.bofh.it> |
| In reply to | #1306927 |
Tue, Jan 12, 2016 at 04:15:07AM IST, sfr@canb.auug.org.au wrote:
>Hi all,
>
>Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/mellanox/mlxsw/spectrum.h
>
>between commit:
>
> 366ce6031529 ("mlxsw: spectrum: Add FDB lock to prevent session interleaving")
>
>from the net tree and commit:
>
> 0d65fc13042f ("mlxsw: spectrum: Implement LAG port join/leave")
>
>from the net-next tree.
>
>I fixed it up (see below) and can carry the fix as necessary (no action
>is required).
Acked-by: Ido Schimmel <idosch@mellanox.com>
Thanks!
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web