diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-11-18 16:44:02 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-18 16:44:03 -0800 |
| commit | 280bb3f98bf8ae89e377311f164dfa9ef87c3a5a (patch) | |
| tree | ff45981fe756f42c893c2176adb2e821f84af4d9 /net | |
| parent | 030946fdb99018938feb0e23a3b4f9c3831fb77d (diff) | |
| parent | 2de680dea6a888271087521a9501a74af57fa076 (diff) | |
| download | linux-stable-280bb3f98bf8ae89e377311f164dfa9ef87c3a5a.tar.gz linux-stable-280bb3f98bf8ae89e377311f164dfa9ef87c3a5a.tar.bz2 linux-stable-280bb3f98bf8ae89e377311f164dfa9ef87c3a5a.zip | |
Merge branch 'atm-replace-in_interrupt-usage'
Sebastian Andrzej Siewior says:
====================
atm: Replace in_interrupt usage
this mini series contains the removal of in_interrupt() in drivers/atm
====================
Link: https://lore.kernel.org/r/20201116162117.387191-1-bigeasy@linutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/atm/raw.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/net/atm/raw.c b/net/atm/raw.c index b3ba44aab0ee..2b5f78a7ec3e 100644 --- a/net/atm/raw.c +++ b/net/atm/raw.c @@ -54,6 +54,8 @@ static int atm_send_aal0(struct atm_vcc *vcc, struct sk_buff *skb) kfree_skb(skb); return -EADDRNOTAVAIL; } + if (vcc->dev->ops->send_bh) + return vcc->dev->ops->send_bh(vcc, skb); return vcc->dev->ops->send(vcc, skb); } @@ -71,7 +73,10 @@ int atm_init_aal34(struct atm_vcc *vcc) vcc->push = atm_push_raw; vcc->pop = atm_pop_raw; vcc->push_oam = NULL; - vcc->send = vcc->dev->ops->send; + if (vcc->dev->ops->send_bh) + vcc->send = vcc->dev->ops->send_bh; + else + vcc->send = vcc->dev->ops->send; return 0; } @@ -80,7 +85,10 @@ int atm_init_aal5(struct atm_vcc *vcc) vcc->push = atm_push_raw; vcc->pop = atm_pop_raw; vcc->push_oam = NULL; - vcc->send = vcc->dev->ops->send; + if (vcc->dev->ops->send_bh) + vcc->send = vcc->dev->ops->send_bh; + else + vcc->send = vcc->dev->ops->send; return 0; } EXPORT_SYMBOL(atm_init_aal5); |