diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-04 17:44:31 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-04 17:44:31 -0700 |
| commit | 96a33ee792ba645680523165a488d3807b656454 (patch) | |
| tree | 0ee2c95708ca79b246574368ca85e1593159c69b /drivers | |
| parent | 06d9001dc44c37da222fd784d58b359680085a0f (diff) | |
| parent | 3b3ac3a93a932292a00ddb13f89bf3bf34b63730 (diff) | |
Merge "net: pppolac/pppopns: Add back the msg_flags"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ppp/pppolac.c | 4 | ||||
| -rw-r--r-- | drivers/net/ppp/pppopns.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ppp/pppolac.c b/drivers/net/ppp/pppolac.c index 0184c96579e9..3a45cf805288 100644 --- a/drivers/net/ppp/pppolac.c +++ b/drivers/net/ppp/pppolac.c @@ -206,7 +206,9 @@ static void pppolac_xmit_core(struct work_struct *delivery_work) while ((skb = skb_dequeue(&delivery_queue))) { struct sock *sk_udp = skb->sk; struct kvec iov = {.iov_base = skb->data, .iov_len = skb->len}; - struct msghdr msg = { 0 }; + struct msghdr msg = { + .msg_flags = MSG_NOSIGNAL | MSG_DONTWAIT, + }; iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, &iov, 1, skb->len); diff --git a/drivers/net/ppp/pppopns.c b/drivers/net/ppp/pppopns.c index d9e06039794e..cdb4fa1af734 100644 --- a/drivers/net/ppp/pppopns.c +++ b/drivers/net/ppp/pppopns.c @@ -189,7 +189,9 @@ static void pppopns_xmit_core(struct work_struct *delivery_work) while ((skb = skb_dequeue(&delivery_queue))) { struct sock *sk_raw = skb->sk; struct kvec iov = {.iov_base = skb->data, .iov_len = skb->len}; - struct msghdr msg = { 0 }; + struct msghdr msg = { + .msg_flags = MSG_NOSIGNAL | MSG_DONTWAIT, + }; iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, &iov, 1, skb->len); |