diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
| commit | aba4e552a2f2c1492441acbccedd8e0a4c53f916 (patch) | |
| tree | 23921efb2b4af590160f034a89ff3da2ecca6e47 /net/rose | |
| parent | 9e17e1aa1cf1cb497d2f67147a51831888affcf3 (diff) | |
Merge with Linux 2.3.43.
Diffstat (limited to 'net/rose')
| -rw-r--r-- | net/rose/af_rose.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index e43573991..93f1a40ab 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -1010,7 +1010,7 @@ static int rose_sendmsg(struct socket *sock, struct msghdr *msg, int len, unsigned char *asmptr; int n, size, qbit = 0; - if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_OOB|MSG_EOR)) + if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR)) return -EINVAL; if (sk->zapped) |