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

Commit 411204a5 authored by Taku Izumi's avatar Taku Izumi Committed by David S. Miller
Browse files

bonding: migrate some macros from bond_alb.c to bond_alb.h 



This patch simply migrates some macros from bond_alb.c to bond_alb.h.

Signed-off-by: default avatarTaku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: default avatarJay Vosburgh <fubar@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad6bad3e

drivers/net/bonding/bond_alb.c

+0 −36
Original line number Original line Diff line number Diff line
@@ -44,42 +44,6 @@ 
#include "bond_alb.h"

#include "bond_alb.h"









#define ALB_TIMER_TICKS_PER_SEC	    10	/* should be a divisor of HZ */

#define BOND_TLB_REBALANCE_INTERVAL 10	/* In seconds, periodic re-balancing.

					 * Used for division - never set

					 * to zero !!!

					 */

#define BOND_ALB_LP_INTERVAL	    1	/* In seconds, periodic send of

					 * learning packets to the switch

					 */



#define BOND_TLB_REBALANCE_TICKS (BOND_TLB_REBALANCE_INTERVAL \

				  * ALB_TIMER_TICKS_PER_SEC)



#define BOND_ALB_LP_TICKS (BOND_ALB_LP_INTERVAL \

			   * ALB_TIMER_TICKS_PER_SEC)



#define TLB_HASH_TABLE_SIZE 256	/* The size of the clients hash table.

				 * Note that this value MUST NOT be smaller

				 * because the key hash table is BYTE wide !

				 */





#define TLB_NULL_INDEX		0xffffffff

#define MAX_LP_BURST		3



/* rlb defs */

#define RLB_HASH_TABLE_SIZE	256

#define RLB_NULL_INDEX		0xffffffff

#define RLB_UPDATE_DELAY	2*ALB_TIMER_TICKS_PER_SEC /* 2 seconds */

#define RLB_ARP_BURST_SIZE	2

#define RLB_UPDATE_RETRY	3	/* 3-ticks - must be smaller than the rlb

					 * rebalance interval (5 min).

					 */

/* RLB_PROMISC_TIMEOUT = 10 sec equals the time that the current slave is

 * promiscuous after failover

 */

#define RLB_PROMISC_TIMEOUT	10*ALB_TIMER_TICKS_PER_SEC





#ifndef __long_aligned

#ifndef __long_aligned

#define __long_aligned __attribute__((aligned((sizeof(long)))))

#define __long_aligned __attribute__((aligned((sizeof(long)))))

drivers/net/bonding/bond_alb.h

+38 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,44 @@ struct slave; 
#define BOND_ALB_INFO(bond)   ((bond)->alb_info)

#define BOND_ALB_INFO(bond)   ((bond)->alb_info)

#define SLAVE_TLB_INFO(slave) ((slave)->tlb_info)

#define SLAVE_TLB_INFO(slave) ((slave)->tlb_info)





#define ALB_TIMER_TICKS_PER_SEC	    10	/* should be a divisor of HZ */

#define BOND_TLB_REBALANCE_INTERVAL 10	/* In seconds, periodic re-balancing.

					 * Used for division - never set

					 * to zero !!!

					 */

#define BOND_ALB_LP_INTERVAL	    1	/* In seconds, periodic send of

					 * learning packets to the switch

					 */



#define BOND_TLB_REBALANCE_TICKS (BOND_TLB_REBALANCE_INTERVAL \

				  * ALB_TIMER_TICKS_PER_SEC)



#define BOND_ALB_LP_TICKS (BOND_ALB_LP_INTERVAL \

			   * ALB_TIMER_TICKS_PER_SEC)



#define TLB_HASH_TABLE_SIZE 256	/* The size of the clients hash table.

				 * Note that this value MUST NOT be smaller

				 * because the key hash table is BYTE wide !

				 */





#define TLB_NULL_INDEX		0xffffffff

#define MAX_LP_BURST		3



/* rlb defs */

#define RLB_HASH_TABLE_SIZE	256

#define RLB_NULL_INDEX		0xffffffff

#define RLB_UPDATE_DELAY	(2*ALB_TIMER_TICKS_PER_SEC) /* 2 seconds */

#define RLB_ARP_BURST_SIZE	2

#define RLB_UPDATE_RETRY	3 /* 3-ticks - must be smaller than the rlb

				   * rebalance interval (5 min).

				   */

/* RLB_PROMISC_TIMEOUT = 10 sec equals the time that the current slave is

 * promiscuous after failover

 */

#define RLB_PROMISC_TIMEOUT	(10*ALB_TIMER_TICKS_PER_SEC)





struct tlb_client_info {

struct tlb_client_info {

	struct slave *tx_slave;	/* A pointer to slave used for transmiting

	struct slave *tx_slave;	/* A pointer to slave used for transmiting

				 * packets to a Client that the Hash function

				 * packets to a Client that the Hash function