diff options
| author | Kees Cook <keescook@chromium.org> | 2016-07-25 13:50:36 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2016-07-25 13:50:36 -0700 |
| commit | 74e630a7582e6b3cb39559d712a0049f08dea8a0 (patch) | |
| tree | 98a752412dcfc74d802024c1d9e8c541b93174f9 /drivers/net/ethernet/marvell/mvneta_bm.c | |
| parent | 35da60941e44dbf57868e67686dd24cc1a33125a (diff) | |
| parent | 523d939ef98fd712632d93a5a2b588e477a7565e (diff) | |
Merge tag 'v4.7' into for-linus/pstore
Linux 4.7
Diffstat (limited to 'drivers/net/ethernet/marvell/mvneta_bm.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvneta_bm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/marvell/mvneta_bm.c b/drivers/net/ethernet/marvell/mvneta_bm.c index 01fccec632ec..466939f8f0cf 100644 --- a/drivers/net/ethernet/marvell/mvneta_bm.c +++ b/drivers/net/ethernet/marvell/mvneta_bm.c @@ -189,6 +189,7 @@ struct mvneta_bm_pool *mvneta_bm_pool_use(struct mvneta_bm *priv, u8 pool_id, SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); hwbm_pool->construct = mvneta_bm_construct; hwbm_pool->priv = new_pool; + spin_lock_init(&hwbm_pool->lock); /* Create new pool */ err = mvneta_bm_pool_create(priv, new_pool); |