diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-06 22:20:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-06 22:20:08 -0400 |
| commit | 216fe8f021e33c36e3b27c49c9f1951f6b037d7f (patch) | |
| tree | a43daec41b4d3955e7a4f8d0ed0654a7c80527ec /drivers/isdn | |
| parent | 9747e2313838ee8f5d8073fd6aa7289255c3c51b (diff) | |
| parent | b29794ec95c6856b316c2295904208bf11ffddd9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just some simple overlapping changes in marvell PHY driver
and the DSA core code.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/mISDN/stack.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index d07dd5196ffc..8aa158a09180 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c @@ -2364,7 +2364,7 @@ static struct ippp_ccp_reset_state *isdn_ppp_ccp_reset_alloc_state(struct ippp_s id); return NULL; } else { - rs = kzalloc(sizeof(struct ippp_ccp_reset_state), GFP_KERNEL); + rs = kzalloc(sizeof(struct ippp_ccp_reset_state), GFP_ATOMIC); if (!rs) return NULL; rs->state = CCPResetIdle; diff --git a/drivers/isdn/mISDN/stack.c b/drivers/isdn/mISDN/stack.c index 8b7faea2ddf8..422dced7c90a 100644 --- a/drivers/isdn/mISDN/stack.c +++ b/drivers/isdn/mISDN/stack.c @@ -75,7 +75,7 @@ send_socklist(struct mISDN_sock_list *sl, struct sk_buff *skb) if (sk->sk_state != MISDN_BOUND) continue; if (!cskb) - cskb = skb_copy(skb, GFP_KERNEL); + cskb = skb_copy(skb, GFP_ATOMIC); if (!cskb) { printk(KERN_WARNING "%s no skb\n", __func__); break; |