xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

802.3ad: generalize out mac address initializer

Browse Source 
Generalize out mac address initializer for the LACPDU multicast
address and use in two places.  Remove the now unused
AD_MULTICAST_LACPDU_ADDR.

Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Holger Eitzenberger
2008-12-26 13:40:48 -08:00
committed by David S. Miller
parent 7addeef6b1
commit e4ac43200f
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/bonding/bond_3ad.c
View File

@@ -95,6 +95,8 @@ static struct mac_addr null_mac_addr = {{0, 0, 0, 0, 0, 0}};
static u16 ad_ticks_per_sec; static u16 ad_ticks_per_sec;
static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000; static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000;
static const u8 lacpdu_mcast_addr[ETH_ALEN] = MULTICAST_LACPDU_ADDR;
// ================= main 802.3ad protocol functions ================== // ================= main 802.3ad protocol functions ==================
static int ad_lacpdu_send(struct port *port); static int ad_lacpdu_send(struct port *port);
static int ad_marker_send(struct port *port, struct bond_marker *marker); static int ad_marker_send(struct port *port, struct bond_marker *marker);
@@ -824,7 +826,6 @@ static int ad_lacpdu_send(struct port *port)
struct sk_buff *skb; struct sk_buff *skb;
struct lacpdu_header *lacpdu_header; struct lacpdu_header *lacpdu_header;
int length = sizeof(struct lacpdu_header); int length = sizeof(struct lacpdu_header);
struct mac_addr lacpdu_multicast_address = AD_MULTICAST_LACPDU_ADDR;
skb = dev_alloc_skb(length); skb = dev_alloc_skb(length);
if (!skb) { if (!skb) {
@@ -839,10 +840,12 @@ static int ad_lacpdu_send(struct port *port)
lacpdu_header = (struct lacpdu_header *)skb_put(skb, length); lacpdu_header = (struct lacpdu_header *)skb_put(skb, length);
lacpdu_header->ad_header.destination_address = lacpdu_multicast_address; memcpy(lacpdu_header->ad_header.destination_address.mac_addr_value,
/* Note: source addres is set to be the member's PERMANENT address, because we use it lacpdu_mcast_addr, ETH_ALEN);
to identify loopback lacpdus in receive. */ /* Note: source addres is set to be the member's PERMANENT address,
lacpdu_header->ad_header.source_address = *((struct mac_addr *)(slave->perm_hwaddr)); because we use it to identify loopback lacpdus in receive. */
memcpy(lacpdu_header->ad_header.source_address.mac_addr_value,
slave->perm_hwaddr, ETH_ALEN);
lacpdu_header->ad_header.length_type = PKT_TYPE_LACPDU; lacpdu_header->ad_header.length_type = PKT_TYPE_LACPDU;
lacpdu_header->lacpdu = port->lacpdu; // struct copy lacpdu_header->lacpdu = port->lacpdu; // struct copy
@@ -866,7 +869,6 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker)
struct sk_buff *skb; struct sk_buff *skb;
struct bond_marker_header *marker_header; struct bond_marker_header *marker_header;
int length = sizeof(struct bond_marker_header); int length = sizeof(struct bond_marker_header);
struct mac_addr lacpdu_multicast_address = AD_MULTICAST_LACPDU_ADDR;
skb = dev_alloc_skb(length + 16); skb = dev_alloc_skb(length + 16);
if (!skb) { if (!skb) {
@@ -882,10 +884,12 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker)
marker_header = (struct bond_marker_header *)skb_put(skb, length); marker_header = (struct bond_marker_header *)skb_put(skb, length);
marker_header->ad_header.destination_address = lacpdu_multicast_address; memcpy(marker_header->ad_header.destination_address.mac_addr_value,
/* Note: source addres is set to be the member's PERMANENT address, because we use it lacpdu_mcast_addr, ETH_ALEN);
to identify loopback MARKERs in receive. */ /* Note: source addres is set to be the member's PERMANENT address,
marker_header->ad_header.source_address = *((struct mac_addr *)(slave->perm_hwaddr)); because we use it to identify loopback MARKERs in receive. */
memcpy(marker_header->ad_header.source_address.mac_addr_value,
slave->perm_hwaddr, ETH_ALEN);
marker_header->ad_header.length_type = PKT_TYPE_LACPDU; marker_header->ad_header.length_type = PKT_TYPE_LACPDU;
marker_header->marker = *marker; // struct copy marker_header->marker = *marker; // struct copy

1
drivers/net/bonding/bond_3ad.h
View File

@@ -33,7 +33,6 @@
#define AD_TIMER_INTERVAL 100 /*msec*/ #define AD_TIMER_INTERVAL 100 /*msec*/
#define MULTICAST_LACPDU_ADDR {0x01, 0x80, 0xC2, 0x00, 0x00, 0x02} #define MULTICAST_LACPDU_ADDR {0x01, 0x80, 0xC2, 0x00, 0x00, 0x02}
#define AD_MULTICAST_LACPDU_ADDR {MULTICAST_LACPDU_ADDR}
#define AD_LACP_SLOW 0 #define AD_LACP_SLOW 0
#define AD_LACP_FAST 1 #define AD_LACP_FAST 1