Skip to content

Commit

Permalink
net/bonding: Make DRV macros private
Browse files Browse the repository at this point in the history
The bonding modules currently defines four macros with
general names that pollute the global namespace:
DRV_VERSION
DRV_RELDATE
DRV_NAME
DRV_DESCRIPTION

Fixing that by defining a private bonding_priv.h
header files which includes those defines.

Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
matanb10 authored and davem330 committed Apr 27, 2015
1 parent a31196b commit 73b5a6f
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 7 deletions.
2 changes: 2 additions & 0 deletions drivers/net/bonding/bond_main.c
Expand Up @@ -82,6 +82,8 @@
#include <net/bond_3ad.h>
#include <net/bond_alb.h>

#include "bonding_priv.h"

/*---------------------------- Module parameters ----------------------------*/

/* monitor all links that often (in milliseconds). <=0 disables monitoring */
Expand Down
1 change: 1 addition & 0 deletions drivers/net/bonding/bond_procfs.c
Expand Up @@ -4,6 +4,7 @@
#include <net/netns/generic.h>
#include <net/bonding.h>

#include "bonding_priv.h"

static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
__acquires(RCU)
Expand Down
25 changes: 25 additions & 0 deletions drivers/net/bonding/bonding_priv.h
@@ -0,0 +1,25 @@
/*
* Bond several ethernet interfaces into a Cisco, running 'Etherchannel'.
*
* Portions are (c) Copyright 1995 Simon "Guru Aleph-Null" Janes
* NCM: Network and Communications Management, Inc.
*
* BUT, I'm the one who modified it for ethernet, so:
* (c) Copyright 1999, Thomas Davis, tadavis@lbl.gov
*
* This software may be used and distributed according to the terms
* of the GNU Public License, incorporated herein by reference.
*
*/

#ifndef _BONDING_PRIV_H
#define _BONDING_PRIV_H

#define DRV_VERSION "3.7.1"
#define DRV_RELDATE "April 27, 2011"
#define DRV_NAME "bonding"
#define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"

#define bond_version DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n"

#endif
7 changes: 0 additions & 7 deletions include/net/bonding.h
Expand Up @@ -30,13 +30,6 @@
#include <net/bond_alb.h>
#include <net/bond_options.h>

#define DRV_VERSION "3.7.1"
#define DRV_RELDATE "April 27, 2011"
#define DRV_NAME "bonding"
#define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"

#define bond_version DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n"

#define BOND_MAX_ARP_TARGETS 16

#define BOND_DEFAULT_MIIMON 100
Expand Down

0 comments on commit 73b5a6f

Please sign in to comment.