Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 122569
b: refs/heads/master
c: 5a03cdb
h: refs/heads/master
i:
  122567: 2001d48
v: v3
  • Loading branch information
Holger Eitzenberger authored and David S. Miller committed Dec 10, 2008
1 parent 840b555 commit 3831a0d
Show file tree
Hide file tree
Showing 7 changed files with 83 additions and 99 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ef65583d01f4060c758dba72f08edc09d8faa719
refs/heads/master: 5a03cdb7f2d7ff88e50153d8c3b90a1d52dca435
60 changes: 29 additions & 31 deletions trunk/drivers/net/bonding/bond_3ad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
*
*/

//#define BONDING_DEBUG 1

#include <linux/skbuff.h>
#include <linux/if_ether.h>
#include <linux/netdevice.h>
Expand Down Expand Up @@ -381,7 +379,7 @@ static u16 __get_link_speed(struct port *port)
}
}

dprintk("Port %d Received link speed %d update from adapter\n", port->actor_port_number, speed);
pr_debug("Port %d Received link speed %d update from adapter\n", port->actor_port_number, speed);
return speed;
}

Expand All @@ -407,12 +405,12 @@ static u8 __get_duplex(struct port *port)
switch (slave->duplex) {
case DUPLEX_FULL:
retval=0x1;
dprintk("Port %d Received status full duplex update from adapter\n", port->actor_port_number);
pr_debug("Port %d Received status full duplex update from adapter\n", port->actor_port_number);
break;
case DUPLEX_HALF:
default:
retval=0x0;
dprintk("Port %d Received status NOT full duplex update from adapter\n", port->actor_port_number);
pr_debug("Port %d Received status NOT full duplex update from adapter\n", port->actor_port_number);
break;
}
}
Expand Down Expand Up @@ -1019,7 +1017,7 @@ static void ad_mux_machine(struct port *port)

// check if the state machine was changed
if (port->sm_mux_state != last_state) {
dprintk("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_mux_state);
pr_debug("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_mux_state);
switch (port->sm_mux_state) {
case AD_MUX_DETACHED:
__detach_bond_from_agg(port);
Expand Down Expand Up @@ -1118,7 +1116,7 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)

// check if the State machine was changed or new lacpdu arrived
if ((port->sm_rx_state != last_state) || (lacpdu)) {
dprintk("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_rx_state);
pr_debug("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_rx_state);
switch (port->sm_rx_state) {
case AD_RX_INITIALIZE:
if (!(port->actor_oper_port_key & AD_DUPLEX_KEY_BITS)) {
Expand Down Expand Up @@ -1205,7 +1203,7 @@ static void ad_tx_machine(struct port *port)
__update_lacpdu_from_port(port);
// send the lacpdu
if (ad_lacpdu_send(port) >= 0) {
dprintk("Sent LACPDU on port %d\n", port->actor_port_number);
pr_debug("Sent LACPDU on port %d\n", port->actor_port_number);
// mark ntt as false, so it will not be sent again until demanded
port->ntt = 0;
}
Expand Down Expand Up @@ -1278,7 +1276,7 @@ static void ad_periodic_machine(struct port *port)

// check if the state machine was changed
if (port->sm_periodic_state != last_state) {
dprintk("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_periodic_state);
pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_periodic_state);
switch (port->sm_periodic_state) {
case AD_NO_PERIODIC:
port->sm_periodic_timer_counter = 0; // zero timer
Expand Down Expand Up @@ -1335,7 +1333,7 @@ static void ad_port_selection_logic(struct port *port)
port->next_port_in_aggregator=NULL;
port->actor_port_aggregator_identifier=0;

dprintk("Port %d left LAG %d\n", port->actor_port_number, temp_aggregator->aggregator_identifier);
pr_debug("Port %d left LAG %d\n", port->actor_port_number, temp_aggregator->aggregator_identifier);
// if the aggregator is empty, clear its parameters, and set it ready to be attached
if (!temp_aggregator->lag_ports) {
ad_clear_agg(temp_aggregator);
Expand Down Expand Up @@ -1378,7 +1376,7 @@ static void ad_port_selection_logic(struct port *port)
port->next_port_in_aggregator=aggregator->lag_ports;
port->aggregator->num_of_ports++;
aggregator->lag_ports=port;
dprintk("Port %d joined LAG %d(existing LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
pr_debug("Port %d joined LAG %d(existing LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);

// mark this port as selected
port->sm_vars |= AD_PORT_SELECTED;
Expand Down Expand Up @@ -1415,7 +1413,7 @@ static void ad_port_selection_logic(struct port *port)
// mark this port as selected
port->sm_vars |= AD_PORT_SELECTED;

dprintk("Port %d joined LAG %d(new LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
pr_debug("Port %d joined LAG %d(new LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
} else {
printk(KERN_ERR DRV_NAME ": %s: Port %d (on %s) did not find a suitable aggregator\n",
port->slave->dev->master->name,
Expand Down Expand Up @@ -1574,19 +1572,19 @@ static void ad_agg_selection_logic(struct aggregator *agg)

// if there is new best aggregator, activate it
if (best) {
dprintk("best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
pr_debug("best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
best->aggregator_identifier, best->num_of_ports,
best->actor_oper_aggregator_key,
best->partner_oper_aggregator_key,
best->is_individual, best->is_active);
dprintk("best ports %p slave %p %s\n",
pr_debug("best ports %p slave %p %s\n",
best->lag_ports, best->slave,
best->slave ? best->slave->dev->name : "NULL");

for (agg = __get_first_agg(best->lag_ports); agg;
agg = __get_next_agg(agg)) {

dprintk("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
pr_debug("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
agg->aggregator_identifier, agg->num_of_ports,
agg->actor_oper_aggregator_key,
agg->partner_oper_aggregator_key,
Expand All @@ -1602,9 +1600,9 @@ static void ad_agg_selection_logic(struct aggregator *agg)
}

best->is_active = 1;
dprintk("LAG %d chosen as the active LAG\n",
pr_debug("LAG %d chosen as the active LAG\n",
best->aggregator_identifier);
dprintk("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
pr_debug("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
best->aggregator_identifier, best->num_of_ports,
best->actor_oper_aggregator_key,
best->partner_oper_aggregator_key,
Expand Down Expand Up @@ -1662,7 +1660,7 @@ static void ad_clear_agg(struct aggregator *aggregator)
aggregator->lag_ports = NULL;
aggregator->is_active = 0;
aggregator->num_of_ports = 0;
dprintk("LAG %d was cleared\n", aggregator->aggregator_identifier);
pr_debug("LAG %d was cleared\n", aggregator->aggregator_identifier);
}
}

Expand Down Expand Up @@ -1747,7 +1745,7 @@ static void ad_initialize_port(struct port *port, int lacp_fast)
static void ad_enable_collecting_distributing(struct port *port)
{
if (port->aggregator->is_active) {
dprintk("Enabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
pr_debug("Enabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
__enable_port(port);
}
}
Expand All @@ -1760,7 +1758,7 @@ static void ad_enable_collecting_distributing(struct port *port)
static void ad_disable_collecting_distributing(struct port *port)
{
if (port->aggregator && MAC_ADDRESS_COMPARE(&(port->aggregator->partner_system), &(null_mac_addr))) {
dprintk("Disabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
pr_debug("Disabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
__disable_port(port);
}
}
Expand Down Expand Up @@ -1798,7 +1796,7 @@ static void ad_marker_info_send(struct port *port)

// send the marker information
if (ad_marker_send(port, &marker) >= 0) {
dprintk("Sent Marker Information on port %d\n", port->actor_port_number);
pr_debug("Sent Marker Information on port %d\n", port->actor_port_number);
}
}
#endif
Expand All @@ -1822,7 +1820,7 @@ static void ad_marker_info_received(struct bond_marker *marker_info,
// send the marker response

if (ad_marker_send(port, &marker) >= 0) {
dprintk("Sent Marker Response on port %d\n", port->actor_port_number);
pr_debug("Sent Marker Response on port %d\n", port->actor_port_number);
}
}

Expand Down Expand Up @@ -2036,7 +2034,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
return;
}

dprintk("Unbinding Link Aggregation Group %d\n", aggregator->aggregator_identifier);
pr_debug("Unbinding Link Aggregation Group %d\n", aggregator->aggregator_identifier);

/* Tell the partner that this port is not suitable for aggregation */
port->actor_oper_port_state &= ~AD_STATE_AGGREGATION;
Expand All @@ -2060,7 +2058,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
// if new aggregator found, copy the aggregator's parameters
// and connect the related lag_ports to the new aggregator
if ((new_aggregator) && ((!new_aggregator->lag_ports) || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator))) {
dprintk("Some port(s) related to LAG %d - replaceing with LAG %d\n", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier);
pr_debug("Some port(s) related to LAG %d - replaceing with LAG %d\n", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier);

if ((new_aggregator->lag_ports == port) && new_aggregator->is_active) {
printk(KERN_INFO DRV_NAME ": %s: Removing an active aggregator\n",
Expand Down Expand Up @@ -2111,7 +2109,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
}
}

dprintk("Unbinding port %d\n", port->actor_port_number);
pr_debug("Unbinding port %d\n", port->actor_port_number);
// find the aggregator that this port is connected to
temp_aggregator = __get_first_agg(port);
for (; temp_aggregator; temp_aggregator = __get_next_agg(temp_aggregator)) {
Expand Down Expand Up @@ -2242,7 +2240,7 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u

switch (lacpdu->subtype) {
case AD_TYPE_LACPDU:
dprintk("Received LACPDU on port %d\n", port->actor_port_number);
pr_debug("Received LACPDU on port %d\n", port->actor_port_number);
ad_rx_machine(lacpdu, port);
break;

Expand All @@ -2251,17 +2249,17 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u

switch (((struct bond_marker *)lacpdu)->tlv_type) {
case AD_MARKER_INFORMATION_SUBTYPE:
dprintk("Received Marker Information on port %d\n", port->actor_port_number);
pr_debug("Received Marker Information on port %d\n", port->actor_port_number);
ad_marker_info_received((struct bond_marker *)lacpdu, port);
break;

case AD_MARKER_RESPONSE_SUBTYPE:
dprintk("Received Marker Response on port %d\n", port->actor_port_number);
pr_debug("Received Marker Response on port %d\n", port->actor_port_number);
ad_marker_response_received((struct bond_marker *)lacpdu, port);
break;

default:
dprintk("Received an unknown Marker subtype on slot %d\n", port->actor_port_number);
pr_debug("Received an unknown Marker subtype on slot %d\n", port->actor_port_number);
}
}
}
Expand Down Expand Up @@ -2289,7 +2287,7 @@ void bond_3ad_adapter_speed_changed(struct slave *slave)

port->actor_admin_port_key &= ~AD_SPEED_KEY_BITS;
port->actor_oper_port_key=port->actor_admin_port_key |= (__get_link_speed(port) << 1);
dprintk("Port %d changed speed\n", port->actor_port_number);
pr_debug("Port %d changed speed\n", port->actor_port_number);
// there is no need to reselect a new aggregator, just signal the
// state machines to reinitialize
port->sm_vars |= AD_PORT_BEGIN;
Expand Down Expand Up @@ -2317,7 +2315,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave)

port->actor_admin_port_key &= ~AD_DUPLEX_KEY_BITS;
port->actor_oper_port_key=port->actor_admin_port_key |= __get_duplex(port);
dprintk("Port %d changed duplex\n", port->actor_port_number);
pr_debug("Port %d changed duplex\n", port->actor_port_number);
// there is no need to reselect a new aggregator, just signal the
// state machines to reinitialize
port->sm_vars |= AD_PORT_BEGIN;
Expand Down
12 changes: 5 additions & 7 deletions trunk/drivers/net/bonding/bond_alb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
*
*/

//#define BONDING_DEBUG 1

#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
Expand Down Expand Up @@ -361,12 +359,12 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
goto out;

if (!arp) {
dprintk("Packet has no ARP data\n");
pr_debug("Packet has no ARP data\n");
goto out;
}

if (skb->len < sizeof(struct arp_pkt)) {
dprintk("Packet is too small to be an ARP\n");
pr_debug("Packet is too small to be an ARP\n");
goto out;
}

Expand All @@ -376,7 +374,7 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
bond_dev->name);
bond = netdev_priv(bond_dev);
rlb_update_entry_from_arp(bond, arp);
dprintk("Server received an ARP Reply from client\n");
pr_debug("Server received an ARP Reply from client\n");
}

res = NET_RX_SUCCESS;
Expand Down Expand Up @@ -730,7 +728,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)
if (tx_slave) {
memcpy(arp->mac_src,tx_slave->dev->dev_addr, ETH_ALEN);
}
dprintk("Server sent ARP Reply packet\n");
pr_debug("Server sent ARP Reply packet\n");
} else if (arp->op_code == htons(ARPOP_REQUEST)) {
/* Create an entry in the rx_hashtbl for this client as a
* place holder.
Expand All @@ -750,7 +748,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)
* updated with their assigned mac.
*/
rlb_req_update_subnet_clients(bond, arp->ip_src);
dprintk("Server sent ARP Request packet\n");
pr_debug("Server sent ARP Request packet\n");
}

return tx_slave;
Expand Down
6 changes: 2 additions & 4 deletions trunk/drivers/net/bonding/bond_ipv6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
*
*/

//#define BONDING_DEBUG 1

#include <linux/types.h>
#include <linux/if_vlan.h>
#include <net/ipv6.h>
Expand Down Expand Up @@ -74,7 +72,7 @@ static void bond_na_send(struct net_device *slave_dev,

addrconf_addr_solict_mult(daddr, &mcaddr);

dprintk("ipv6 na on slave %s: dest %pI6, src %pI6\n",
pr_debug("ipv6 na on slave %s: dest %pI6, src %pI6\n",
slave_dev->name, &mcaddr, daddr);

skb = ndisc_build_skb(slave_dev, &mcaddr, daddr, &icmp6h, daddr,
Expand Down Expand Up @@ -110,7 +108,7 @@ void bond_send_unsolicited_na(struct bonding *bond)
struct inet6_dev *idev;
int is_router;

dprintk("bond_send_unsol_na: bond %s slave %s\n", bond->dev->name,
pr_debug("bond_send_unsol_na: bond %s slave %s\n", bond->dev->name,
slave ? slave->dev->name : "NULL");

if (!slave || !bond->send_unsol_na ||
Expand Down
Loading

0 comments on commit 3831a0d

Please sign in to comment.