Small conflict around locking in rxrpc_process_event() - channel_lock moved to bundle in next, while state lock needs _bh() from net.
Showing the changes to include/uapi/linux (1 of 74 files). Show all
Unified · Split
| @@ -51,11 +51,11 @@ enum rxrpc_cmsg_type { · 50 unmodified lines | ||
| 51 | 51 | RXRPC_BUSY = 6, /* -r: server busy received [terminal] */ |
| 52 | 52 | RXRPC_LOCAL_ERROR = 7, /* -r: local error generated [terminal] */ |
| 53 | 53 | RXRPC_NEW_CALL = 8, /* -r: [Service] new incoming call notification */ |
| 54 | − RXRPC_ACCEPT = 9, /* s-: [Service] accept request */ | |
| 55 | 54 | RXRPC_EXCLUSIVE_CALL = 10, /* s-: Call should be on exclusive connection */ |
| 56 | 55 | RXRPC_UPGRADE_SERVICE = 11, /* s-: Request service upgrade for client call */ |
| 57 | 56 | RXRPC_TX_LENGTH = 12, /* s-: Total length of Tx data */ |
| 58 | 57 | RXRPC_SET_CALL_TIMEOUT = 13, /* s-: Set one or more call timeouts */ |
| 58 | + RXRPC_CHARGE_ACCEPT = 14, /* s-: Charge the accept pool with a user call ID */ | |
| 59 | 59 | RXRPC__SUPPORTED |
| 60 | 60 | }; |
| 61 | 61 | |