~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

TOMOYO Linux Cross Reference
Linux/net/wireless/ocb.c

Version: ~ [ linux-6.11-rc3 ] ~ [ linux-6.10.4 ] ~ [ linux-6.9.12 ] ~ [ linux-6.8.12 ] ~ [ linux-6.7.12 ] ~ [ linux-6.6.45 ] ~ [ linux-6.5.13 ] ~ [ linux-6.4.16 ] ~ [ linux-6.3.13 ] ~ [ linux-6.2.16 ] ~ [ linux-6.1.104 ] ~ [ linux-6.0.19 ] ~ [ linux-5.19.17 ] ~ [ linux-5.18.19 ] ~ [ linux-5.17.15 ] ~ [ linux-5.16.20 ] ~ [ linux-5.15.164 ] ~ [ linux-5.14.21 ] ~ [ linux-5.13.19 ] ~ [ linux-5.12.19 ] ~ [ linux-5.11.22 ] ~ [ linux-5.10.223 ] ~ [ linux-5.9.16 ] ~ [ linux-5.8.18 ] ~ [ linux-5.7.19 ] ~ [ linux-5.6.19 ] ~ [ linux-5.5.19 ] ~ [ linux-5.4.281 ] ~ [ linux-5.3.18 ] ~ [ linux-5.2.21 ] ~ [ linux-5.1.21 ] ~ [ linux-5.0.21 ] ~ [ linux-4.20.17 ] ~ [ linux-4.19.319 ] ~ [ linux-4.18.20 ] ~ [ linux-4.17.19 ] ~ [ linux-4.16.18 ] ~ [ linux-4.15.18 ] ~ [ linux-4.14.336 ] ~ [ linux-4.13.16 ] ~ [ linux-4.12.14 ] ~ [ linux-4.11.12 ] ~ [ linux-4.10.17 ] ~ [ linux-4.9.337 ] ~ [ linux-4.4.302 ] ~ [ linux-3.10.108 ] ~ [ linux-2.6.32.71 ] ~ [ linux-2.6.0 ] ~ [ linux-2.4.37.11 ] ~ [ unix-v6-master ] ~ [ ccs-tools-1.8.9 ] ~ [ policy-sample ] ~
Architecture: ~ [ i386 ] ~ [ alpha ] ~ [ m68k ] ~ [ mips ] ~ [ ppc ] ~ [ sparc ] ~ [ sparc64 ] ~

Diff markup

Differences between /net/wireless/ocb.c (Version linux-6.11-rc3) and /net/wireless/ocb.c (Version linux-4.18.20)


  1 // SPDX-License-Identifier: GPL-2.0-only       << 
  2 /*                                                  1 /*
  3  * OCB mode implementation                          2  * OCB mode implementation
  4  *                                                  3  *
  5  * Copyright: (c) 2014 Czech Technical Univers      4  * Copyright: (c) 2014 Czech Technical University in Prague
  6  *            (c) 2014 Volkswagen Group Resear      5  *            (c) 2014 Volkswagen Group Research
  7  * Copyright (C) 2022-2023 Intel Corporation   << 
  8  * Author:    Rostislav Lisovy <rostislav.liso      6  * Author:    Rostislav Lisovy <rostislav.lisovy@fel.cvut.cz>
  9  * Funded by: Volkswagen Group Research             7  * Funded by: Volkswagen Group Research
                                                   >>   8  *
                                                   >>   9  * This program is free software; you can redistribute it and/or modify
                                                   >>  10  * it under the terms of the GNU General Public License version 2 as
                                                   >>  11  * published by the Free Software Foundation.
 10  */                                                12  */
 11                                                    13 
 12 #include <linux/ieee80211.h>                       14 #include <linux/ieee80211.h>
 13 #include <net/cfg80211.h>                          15 #include <net/cfg80211.h>
 14 #include "nl80211.h"                               16 #include "nl80211.h"
 15 #include "core.h"                                  17 #include "core.h"
 16 #include "rdev-ops.h"                              18 #include "rdev-ops.h"
 17                                                    19 
 18 int cfg80211_join_ocb(struct cfg80211_register !!  20 int __cfg80211_join_ocb(struct cfg80211_registered_device *rdev,
 19                       struct net_device *dev,  !!  21                         struct net_device *dev,
 20                       struct ocb_setup *setup) !!  22                         struct ocb_setup *setup)
 21 {                                                  23 {
 22         struct wireless_dev *wdev = dev->ieee8     24         struct wireless_dev *wdev = dev->ieee80211_ptr;
 23         int err;                                   25         int err;
 24                                                    26 
 25         lockdep_assert_wiphy(wdev->wiphy);     !!  27         ASSERT_WDEV_LOCK(wdev);
 26                                                    28 
 27         if (dev->ieee80211_ptr->iftype != NL80     29         if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_OCB)
 28                 return -EOPNOTSUPP;                30                 return -EOPNOTSUPP;
 29                                                    31 
 30         if (!rdev->ops->join_ocb)                  32         if (!rdev->ops->join_ocb)
 31                 return -EOPNOTSUPP;                33                 return -EOPNOTSUPP;
 32                                                    34 
 33         if (WARN_ON(!setup->chandef.chan))         35         if (WARN_ON(!setup->chandef.chan))
 34                 return -EINVAL;                    36                 return -EINVAL;
 35                                                    37 
 36         err = rdev_join_ocb(rdev, dev, setup);     38         err = rdev_join_ocb(rdev, dev, setup);
 37         if (!err)                                  39         if (!err)
 38                 wdev->u.ocb.chandef = setup->c !!  40                 wdev->chandef = setup->chandef;
 39                                                    41 
 40         return err;                                42         return err;
 41 }                                                  43 }
 42                                                    44 
 43 int cfg80211_leave_ocb(struct cfg80211_registe !!  45 int cfg80211_join_ocb(struct cfg80211_registered_device *rdev,
 44                        struct net_device *dev) !!  46                       struct net_device *dev,
                                                   >>  47                       struct ocb_setup *setup)
                                                   >>  48 {
                                                   >>  49         struct wireless_dev *wdev = dev->ieee80211_ptr;
                                                   >>  50         int err;
                                                   >>  51 
                                                   >>  52         wdev_lock(wdev);
                                                   >>  53         err = __cfg80211_join_ocb(rdev, dev, setup);
                                                   >>  54         wdev_unlock(wdev);
                                                   >>  55 
                                                   >>  56         return err;
                                                   >>  57 }
                                                   >>  58 
                                                   >>  59 int __cfg80211_leave_ocb(struct cfg80211_registered_device *rdev,
                                                   >>  60                          struct net_device *dev)
 45 {                                                  61 {
 46         struct wireless_dev *wdev = dev->ieee8     62         struct wireless_dev *wdev = dev->ieee80211_ptr;
 47         int err;                                   63         int err;
 48                                                    64 
 49         lockdep_assert_wiphy(wdev->wiphy);     !!  65         ASSERT_WDEV_LOCK(wdev);
 50                                                    66 
 51         if (dev->ieee80211_ptr->iftype != NL80     67         if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_OCB)
 52                 return -EOPNOTSUPP;                68                 return -EOPNOTSUPP;
 53                                                    69 
 54         if (!rdev->ops->leave_ocb)                 70         if (!rdev->ops->leave_ocb)
 55                 return -EOPNOTSUPP;                71                 return -EOPNOTSUPP;
 56                                                    72 
 57         if (!wdev->u.ocb.chandef.chan)         << 
 58                 return -ENOTCONN;              << 
 59                                                << 
 60         err = rdev_leave_ocb(rdev, dev);           73         err = rdev_leave_ocb(rdev, dev);
 61         if (!err)                                  74         if (!err)
 62                 memset(&wdev->u.ocb.chandef, 0 !!  75                 memset(&wdev->chandef, 0, sizeof(wdev->chandef));
                                                   >>  76 
                                                   >>  77         return err;
                                                   >>  78 }
                                                   >>  79 
                                                   >>  80 int cfg80211_leave_ocb(struct cfg80211_registered_device *rdev,
                                                   >>  81                        struct net_device *dev)
                                                   >>  82 {
                                                   >>  83         struct wireless_dev *wdev = dev->ieee80211_ptr;
                                                   >>  84         int err;
                                                   >>  85 
                                                   >>  86         wdev_lock(wdev);
                                                   >>  87         err = __cfg80211_leave_ocb(rdev, dev);
                                                   >>  88         wdev_unlock(wdev);
 63                                                    89 
 64         return err;                                90         return err;
 65 }                                                  91 }
 66                                                    92 

~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

kernel.org | git.kernel.org | LWN.net | Project Home | SVN repository | Mail admin

Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.

sflogo.php