Skip to content

Commit

Permalink
net/dcb: make dcbnl.c explicitly non-modular
Browse files Browse the repository at this point in the history
The Kconfig currently controlling compilation of this code is:

net/dcb/Kconfig:config DCB
net/dcb/Kconfig:        bool "Data Center Bridging support"

...meaning that it currently is not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.  We can
change to one of the other priority initcalls (subsys?) at any later
date, if desired.

We also delete the MODULE_LICENSE tag etc. since all that information
is (or is now) already contained at the top of the file in the comments.

Cc: "David S. Miller" <[email protected]>
Cc: Or Gerlitz <[email protected]>
Cc: Anish Bhatt <[email protected]>
Cc: John Fastabend <[email protected]>
Cc: Shani Michaeli <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Paul Gortmaker authored and davem330 committed Oct 9, 2015
1 parent b6191ae commit 36b9ad8
Showing 1 changed file with 3 additions and 27 deletions.
30 changes: 3 additions & 27 deletions net/dcb/dcbnl.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* You should have received a copy of the GNU General Public License along with
* this program; if not, see <http://www.gnu.org/licenses/>.
*
* Description: Data Center Bridging netlink interface
* Author: Lucy Liu <[email protected]>
*/

Expand All @@ -24,7 +25,7 @@
#include <linux/dcbnl.h>
#include <net/dcbevent.h>
#include <linux/rtnetlink.h>
#include <linux/module.h>
#include <linux/init.h>
#include <net/sock.h>

/* Data Center Bridging (DCB) is a collection of Ethernet enhancements
Expand All @@ -48,10 +49,6 @@
* features for capable devices.
*/

MODULE_AUTHOR("Lucy Liu, <[email protected]>");
MODULE_DESCRIPTION("Data Center Bridging netlink interface");
MODULE_LICENSE("GPL");

/**************** DCB attribute policies *************************************/

/* DCB netlink attributes policy */
Expand Down Expand Up @@ -1935,19 +1932,6 @@ int dcb_ieee_delapp(struct net_device *dev, struct dcb_app *del)
}
EXPORT_SYMBOL(dcb_ieee_delapp);

static void dcb_flushapp(void)
{
struct dcb_app_type *app;
struct dcb_app_type *tmp;

spin_lock_bh(&dcb_lock);
list_for_each_entry_safe(app, tmp, &dcb_app_list, list) {
list_del(&app->list);
kfree(app);
}
spin_unlock_bh(&dcb_lock);
}

static int __init dcbnl_init(void)
{
INIT_LIST_HEAD(&dcb_app_list);
Expand All @@ -1957,12 +1941,4 @@ static int __init dcbnl_init(void)

return 0;
}
module_init(dcbnl_init);

static void __exit dcbnl_exit(void)
{
rtnl_unregister(PF_UNSPEC, RTM_GETDCB);
rtnl_unregister(PF_UNSPEC, RTM_SETDCB);
dcb_flushapp();
}
module_exit(dcbnl_exit);
device_initcall(dcbnl_init);

0 comments on commit 36b9ad8

Please sign in to comment.