aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_3ad.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/bonding/bond_3ad.c')
-rw-r--r--drivers/net/bonding/bond_3ad.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 48cf24ff4e6f..171782e2bb39 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -840,7 +840,7 @@ static int ad_lacpdu_send(struct port *port)
840 lacpdu_header = (struct lacpdu_header *)skb_put(skb, length); 840 lacpdu_header = (struct lacpdu_header *)skb_put(skb, length);
841 841
842 memcpy(lacpdu_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN); 842 memcpy(lacpdu_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN);
843 /* Note: source addres is set to be the member's PERMANENT address, 843 /* Note: source address is set to be the member's PERMANENT address,
844 because we use it to identify loopback lacpdus in receive. */ 844 because we use it to identify loopback lacpdus in receive. */
845 memcpy(lacpdu_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN); 845 memcpy(lacpdu_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN);
846 lacpdu_header->hdr.h_proto = PKT_TYPE_LACPDU; 846 lacpdu_header->hdr.h_proto = PKT_TYPE_LACPDU;
@@ -881,7 +881,7 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker)
881 marker_header = (struct bond_marker_header *)skb_put(skb, length); 881 marker_header = (struct bond_marker_header *)skb_put(skb, length);
882 882
883 memcpy(marker_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN); 883 memcpy(marker_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN);
884 /* Note: source addres is set to be the member's PERMANENT address, 884 /* Note: source address is set to be the member's PERMANENT address,
885 because we use it to identify loopback MARKERs in receive. */ 885 because we use it to identify loopback MARKERs in receive. */
886 memcpy(marker_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN); 886 memcpy(marker_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN);
887 marker_header->hdr.h_proto = PKT_TYPE_LACPDU; 887 marker_header->hdr.h_proto = PKT_TYPE_LACPDU;
@@ -1916,7 +1916,7 @@ int bond_3ad_bind_slave(struct slave *slave)
1916 return -1; 1916 return -1;
1917 } 1917 }
1918 1918
1919 //check that the slave has not been intialized yet. 1919 //check that the slave has not been initialized yet.
1920 if (SLAVE_AD_INFO(slave).port.slave != slave) { 1920 if (SLAVE_AD_INFO(slave).port.slave != slave) {
1921 1921
1922 // port initialization 1922 // port initialization