summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/xircom
diff options
context:
space:
mode:
authorXie He <xie.he.0141@gmail.com>2020-12-08 14:50:44 -0800
committerDavid S. Miller <davem@davemloft.net>2020-12-10 13:18:28 -0800
commit3b0c860f872da622a39707bda11064395199836f (patch)
tree7205a80fcdcb9902a8cdc1897f3d40bdc3141e4a /drivers/net/ethernet/xircom
parentbfa5e98c9de466bfe25a9b4bf6ef9122aee2d06a (diff)
net: lapbether: Consider it successful if (dis)connecting when already (dis)connected
When the upper layer instruct us to connect (or disconnect), but we have already connected (or disconnected), consider this operation successful rather than failed. This can help the upper layer to correct its record about whether we are connected or not here in layer 2. The upper layer may not have the correct information about whether we are connected or not. This can happen if this driver has already been running for some time when the "x25" module gets loaded. Another X.25 driver (hdlc_x25) is already doing this, so we make this driver do this, too. Cc: Martin Schiller <ms@dev.tdt.de> Signed-off-by: Xie He <xie.he.0141@gmail.com> Acked-by: Martin Schiller <ms@dev.tdt.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/xircom')
0 files changed, 0 insertions, 0 deletions
tion value='dependabot/composer/firebase/php-jwt-6.10.1'>dependabot/composer/firebase/php-jwt-6.10.1 Mirror of https://github.com/nextcloud/spreedmatthias
summaryrefslogtreecommitdiffstats
path: root/lib/Notification
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2023-11-02 16:40:37 +0100
committerGitHub <noreply@github.com>2023-11-02 16:40:37 +0100
commit58910aedc45953742179ec9a9958f840e6d8e8bd (patch)
tree6daa95b790743d21b882619f32b872ca23b1c750 /lib/Notification
parent6c0d57a6e4d8d12f0c62d874c78375b8819f981c (diff)
parent6612bc48a8d229a584f8ae80e5d298f7d06df01c (diff)
Merge pull request #10766 from nextcloud/bugfix/noid/make-invitations-unique
Fix "Validation by remoteAttendeeId + accessToken might be ambiguous"
Diffstat (limited to 'lib/Notification')
-rw-r--r--lib/Notification/Notifier.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
index fbc927aef..bd4b8e319 100644
--- a/lib/Notification/Notifier.php
+++ b/lib/Notification/Notifier.php
@@ -403,8 +403,8 @@ class Notifier implements INotifier {
if ($invite->getUserId() !== $notification->getUser()) {
throw new AlreadyProcessedException();
}
- $room = $this->manager->getRoomById($invite->getRoomId());
- } catch (RoomNotFoundException $e) {
+ $room = $this->manager->getRoomById($invite->getLocalRoomId());
+ } catch (RoomNotFoundException) {
// Room does not exist
throw new AlreadyProcessedException();
}