Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73b5a6f2 authored by Matan Barak's avatar Matan Barak Committed by David S. Miller
Browse files

net/bonding: Make DRV macros private 



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: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a31196b0

drivers/net/bonding/bond_main.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,8 @@ 
#include <net/bond_3ad.h>

#include <net/bond_3ad.h>

#include <net/bond_alb.h>

#include <net/bond_alb.h>





#include "bonding_priv.h"



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

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





/* monitor all links that often (in milliseconds). <=0 disables monitoring */

/* monitor all links that often (in milliseconds). <=0 disables monitoring */

drivers/net/bonding/bond_procfs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <net/netns/generic.h>

#include <net/netns/generic.h>

#include <net/bonding.h>

#include <net/bonding.h>





#include "bonding_priv.h"





static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)

static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)

	__acquires(RCU)

	__acquires(RCU)

drivers/net/bonding/bonding_priv.h

0 → 100644
+25 −0
Original line number Original line Diff line number Diff line 
/*

 * 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

include/net/bonding.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -30,13 +30,6 @@ 
#include <net/bond_alb.h>

#include <net/bond_alb.h>

#include <net/bond_options.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_MAX_ARP_TARGETS	16





#define BOND_DEFAULT_MIIMON	100

#define BOND_DEFAULT_MIIMON	100