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

Commit 59be2e04 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)
  net: sh_eth alignment fix for sh7724 using NET_IP_ALIGN V2
  ixgbe: allow tx of pre-formatted vlan tagged packets
  ixgbe: Fix 82598 premature copper PHY link indicatation
  ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters
  bcm63xx_enet: fix compilation failure after get_stats_count removal
  packet: dont call sleeping functions while holding rcu_read_lock()
  tcp: Revert per-route SACK/DSACK/TIMESTAMP changes.
  ipvs: zero usvc and udest
  netfilter: fix crashes in bridge netfilter caused by fragment jumps
  ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery
  sky2: leave PCI config space writeable
  sky2: print Optima chip name
  x25: Update maintainer.
  ipvs: fix synchronization on connection close
  netfilter: xtables: document minimal required version
  drivers/net/bonding/: : use pr_fmt
  can: CAN_MCP251X should depend on HAS_DMA
  drivers/net/usb: Correct code taking the size of a pointer
  drivers/net/cpmac.c: Correct code taking the size of a pointer
  drivers/net/sfc: Correct code taking the size of a pointer
  ...
parents e69381b4 503914cf

Documentation/Changes

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ o oprofile 0.9 # oprofiled --version 
o  udev                   081                     # udevinfo -V

o  grub                   0.93                    # grub --version

o  mcelog		  0.6

o  iptables               1.4.1                   # iptables -V





Kernel compilation

==================

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -5991,9 +5991,9 @@ F: sound/soc/codecs/wm8350.* 
F:	sound/soc/codecs/wm8400.*



X.25 NETWORK LAYER

M:	Henner Eisen <eis@baty.hanse.de>

M:	Andrew Hendry <andrew.hendry@gmail.com>

L:	linux-x25@vger.kernel.org

S:	Maintained

S:	Odd Fixes

F:	Documentation/networking/x25*

F:	include/net/x25*

F:	net/x25/

drivers/atm/iphase.c

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static int ia_cbr_setup (IADEV *dev, struct atm_vcc *vcc) { 
          memcpy((caddr_t)&cbrVC,(caddr_t)TstSchedTbl,sizeof(cbrVC));

       } /* while */

       // Move this VCI number into this location of the CBR Sched table.

       memcpy((caddr_t)TstSchedTbl, (caddr_t)&vcIndex,sizeof(TstSchedTbl));

       memcpy((caddr_t)TstSchedTbl, (caddr_t)&vcIndex, sizeof(*TstSchedTbl));

       dev->CbrRemEntries--;

       toBeAssigned--;

   } /* while */

drivers/net/bcm63xx_enet.c

+9 −3
Original line number Diff line number Diff line
@@ -1245,9 +1245,15 @@ static void bcm_enet_get_drvinfo(struct net_device *netdev, 
	drvinfo->n_stats = BCM_ENET_STATS_LEN;

}



static int bcm_enet_get_stats_count(struct net_device *netdev)

static int bcm_enet_get_sset_count(struct net_device *netdev,

					int string_set)

{

	switch (string_set) {

	case ETH_SS_STATS:

		return BCM_ENET_STATS_LEN;

	default:

		return -EINVAL;

	}

}



static void bcm_enet_get_strings(struct net_device *netdev,
@@ -1473,7 +1479,7 @@ static int bcm_enet_set_pauseparam(struct net_device *dev, 


static struct ethtool_ops bcm_enet_ethtool_ops = {

	.get_strings		= bcm_enet_get_strings,

	.get_stats_count	= bcm_enet_get_stats_count,

	.get_sset_count		= bcm_enet_get_sset_count,

	.get_ethtool_stats      = bcm_enet_get_ethtool_stats,

	.get_settings		= bcm_enet_get_settings,

	.set_settings		= bcm_enet_set_settings,

drivers/net/bonding/bond_3ad.c

+94 −77
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
 *

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/skbuff.h>

#include <linux/if_ether.h>

#include <linux/netdevice.h>
@@ -352,7 +354,8 @@ static u16 __get_link_speed(struct port *port) 
		}

	}



	pr_debug("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;

}
@@ -378,12 +381,14 @@ static u8 __get_duplex(struct port *port) 
		switch (slave->duplex) {

		case DUPLEX_FULL:

			retval=0x1;

			pr_debug("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;

			pr_debug("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;

		}

	}
@@ -980,7 +985,9 @@ static void ad_mux_machine(struct port *port) 


	// check if the state machine was changed

	if (port->sm_mux_state != last_state) {

		pr_debug("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);
@@ -1079,7 +1086,9 @@ 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)) {

		pr_debug("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)) {
@@ -1126,9 +1135,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port) 
			// detect loopback situation

			if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) {

				// INFO_RECEIVED_LOOPBACK_FRAMES

				pr_err(DRV_NAME ": %s: An illegal loopback occurred on "

				       "adapter (%s). Check the configuration to verify that all "

				       "Adapters are connected to 802.3ad compliant switch ports\n",

				pr_err("%s: An illegal loopback occurred on adapter (%s).\n"

				       "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n",

				       port->slave->dev->master->name, port->slave->dev->name);

				__release_rx_machine_lock(port);

				return;
@@ -1166,7 +1174,8 @@ static void ad_tx_machine(struct port *port) 
			__update_lacpdu_from_port(port);



			if (ad_lacpdu_send(port) >= 0) {

				pr_debug("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 */
@@ -1241,7 +1250,9 @@ static void ad_periodic_machine(struct port *port) 


	// check if the state machine was changed

	if (port->sm_periodic_state != last_state) {

		pr_debug("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
@@ -1298,7 +1309,9 @@ static void ad_port_selection_logic(struct port *port) 
				port->next_port_in_aggregator=NULL;

				port->actor_port_aggregator_identifier=0;



				pr_debug("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);
@@ -1307,9 +1320,7 @@ static void ad_port_selection_logic(struct port *port) 
			}

		}

		if (!curr_port) { // meaning: the port was related to an aggregator but was not on the aggregator port list

			pr_warning(DRV_NAME ": %s: Warning: Port %d (on %s) "

				   "was related to aggregator %d but was not "

				   "on its port list\n",

			pr_warning("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",

				   port->slave->dev->master->name,

				   port->actor_port_number,

				   port->slave->dev->name,
@@ -1343,7 +1354,9 @@ 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;

			pr_debug("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;
@@ -1380,10 +1393,11 @@ static void ad_port_selection_logic(struct port *port) 
			// mark this port as selected

			port->sm_vars |= AD_PORT_SELECTED;



			pr_debug("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 {

			pr_err(DRV_NAME ": %s: Port %d (on %s) did not find "

			       "a suitable aggregator\n",

			pr_err("%s: Port %d (on %s) did not find a suitable aggregator\n",

			       port->slave->dev->master->name,

			       port->actor_port_number, port->slave->dev->name);

		}
@@ -1460,8 +1474,7 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best, 
		break;



	default:

		pr_warning(DRV_NAME

			   ": %s: Impossible agg select mode %d\n",

		pr_warning("%s: Impossible agg select mode %d\n",

			   curr->slave->dev->master->name,

			   __get_agg_selection_mode(curr->lag_ports));

		break;
@@ -1566,9 +1579,7 @@ static void ad_agg_selection_logic(struct aggregator *agg) 


		// check if any partner replys

		if (best->is_individual) {

			pr_warning(DRV_NAME ": %s: Warning: No 802.3ad"

			       " response from the link partner for any"

			       " adapters in the bond\n",

			pr_warning("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",

				   best->slave->dev->master->name);

		}
@@ -1633,7 +1644,8 @@ static void ad_clear_agg(struct aggregator *aggregator) 
		aggregator->lag_ports = NULL;

		aggregator->is_active = 0;

		aggregator->num_of_ports = 0;

		pr_debug("LAG %d was cleared\n", aggregator->aggregator_identifier);

		pr_debug("LAG %d was cleared\n",

			 aggregator->aggregator_identifier);

	}

}
@@ -1728,7 +1740,9 @@ 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) {

		pr_debug("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);

	}

}
@@ -1741,7 +1755,9 @@ 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))) {

		pr_debug("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);

	}

}
@@ -1779,7 +1795,8 @@ static void ad_marker_info_send(struct port *port) 


	// send the marker information

	if (ad_marker_send(port, &marker) >= 0) {

		pr_debug("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
@@ -1803,7 +1820,8 @@ static void ad_marker_info_received(struct bond_marker *marker_info, 
	// send the marker response



	if (ad_marker_send(port, &marker) >= 0) {

		pr_debug("Sent Marker Response on port %d\n", port->actor_port_number);

		pr_debug("Sent Marker Response on port %d\n",

			 port->actor_port_number);

	}

}
@@ -1889,8 +1907,7 @@ int bond_3ad_bind_slave(struct slave *slave) 
	struct aggregator *aggregator;



	if (bond == NULL) {

		pr_err(DRV_NAME ": %s: The slave %s is not attached to "

		       "its bond\n",

		pr_err("%s: The slave %s is not attached to its bond\n",

		       slave->dev->master->name, slave->dev->name);

		return -1;

	}
@@ -1966,13 +1983,13 @@ void bond_3ad_unbind_slave(struct slave *slave) 


	// if slave is null, the whole port is not initialized

	if (!port->slave) {

		pr_warning(DRV_NAME ": Warning: %s: Trying to "

			   "unbind an uninitialized port on %s\n",

		pr_warning("Warning: %s: Trying to unbind an uninitialized port on %s\n",

			   slave->dev->master->name, slave->dev->name);

		return;

	}



	pr_debug("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;
@@ -1996,10 +2013,12 @@ 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))) {

				pr_debug("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) {

					pr_info(DRV_NAME ": %s: Removing an active aggregator\n",

					pr_info("%s: Removing an active aggregator\n",

						aggregator->slave->dev->master->name);

					// select new active aggregator

					 select_new_active_agg = 1;
@@ -2030,8 +2049,7 @@ void bond_3ad_unbind_slave(struct slave *slave) 
					ad_agg_selection_logic(__get_first_agg(port));

				}

			} else {

				pr_warning(DRV_NAME ": %s: Warning: unbinding aggregator, "

					   "and could not find a new aggregator for its ports\n",

				pr_warning("%s: Warning: unbinding aggregator, and could not find a new aggregator for its ports\n",

					   slave->dev->master->name);

			}

		} else { // in case that the only port related to this aggregator is the one we want to remove
@@ -2039,7 +2057,7 @@ void bond_3ad_unbind_slave(struct slave *slave) 
			// clear the aggregator

			ad_clear_agg(aggregator);

			if (select_new_active_agg) {

				pr_info(DRV_NAME ": %s: Removing an active aggregator\n",

				pr_info("%s: Removing an active aggregator\n",

					slave->dev->master->name);

				// select new active aggregator

				ad_agg_selection_logic(__get_first_agg(port));
@@ -2066,7 +2084,7 @@ void bond_3ad_unbind_slave(struct slave *slave) 
					// clear the aggregator

					ad_clear_agg(temp_aggregator);

					if (select_new_active_agg) {

						pr_info(DRV_NAME ": %s: Removing an active aggregator\n",

						pr_info("%s: Removing an active aggregator\n",

							slave->dev->master->name);

						// select new active aggregator

						ad_agg_selection_logic(__get_first_agg(port));
@@ -2115,8 +2133,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work) 
		// select the active aggregator for the bond

		if ((port = __get_first_port(bond))) {

			if (!port->slave) {

				pr_warning(DRV_NAME ": %s: Warning: bond's first port is "

					   "uninitialized\n", bond->dev->name);

				pr_warning("%s: Warning: bond's first port is uninitialized\n",

					   bond->dev->name);

				goto re_arm;

			}
@@ -2129,8 +2147,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work) 
	// for each port run the state machines

	for (port = __get_first_port(bond); port; port = __get_next_port(port)) {

		if (!port->slave) {

			pr_warning(DRV_NAME ": %s: Warning: Found an uninitialized "

				   "port\n", bond->dev->name);

			pr_warning("%s: Warning: Found an uninitialized port\n",

				   bond->dev->name);

			goto re_arm;

		}
@@ -2171,15 +2189,15 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u 
		port = &(SLAVE_AD_INFO(slave).port);



		if (!port->slave) {

			pr_warning(DRV_NAME ": %s: Warning: port of slave %s "

				   "is uninitialized\n",

			pr_warning("%s: Warning: port of slave %s is uninitialized\n",

				   slave->dev->name, slave->dev->master->name);

			return;

		}



		switch (lacpdu->subtype) {

		case AD_TYPE_LACPDU:

			pr_debug("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;
@@ -2188,17 +2206,20 @@ 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:

				pr_debug("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:

				pr_debug("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:

				pr_debug("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);

			}

		}

	}
@@ -2218,8 +2239,7 @@ void bond_3ad_adapter_speed_changed(struct slave *slave) 


	// if slave is null, the whole port is not initialized

	if (!port->slave) {

		pr_warning(DRV_NAME ": Warning: %s: speed "

			   "changed for uninitialized port on %s\n",

		pr_warning("Warning: %s: speed changed for uninitialized port on %s\n",

			   slave->dev->master->name, slave->dev->name);

		return;

	}
@@ -2246,8 +2266,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave) 


	// if slave is null, the whole port is not initialized

	if (!port->slave) {

		pr_warning(DRV_NAME ": %s: Warning: duplex changed "

			   "for uninitialized port on %s\n",

		pr_warning("%s: Warning: duplex changed for uninitialized port on %s\n",

			   slave->dev->master->name, slave->dev->name);

		return;

	}
@@ -2275,8 +2294,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link) 


	// if slave is null, the whole port is not initialized

	if (!port->slave) {

		pr_warning(DRV_NAME ": Warning: %s: link status changed for "

			   "uninitialized port on %s\n",

		pr_warning("Warning: %s: link status changed for uninitialized port on %s\n",

			   slave->dev->master->name, slave->dev->name);

		return;

	}
@@ -2381,8 +2399,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev) 
	}



	if (bond_3ad_get_active_agg_info(bond, &ad_info)) {

		pr_debug(DRV_NAME ": %s: Error: "

			 "bond_3ad_get_active_agg_info failed\n", dev->name);

		pr_debug("%s: Error: bond_3ad_get_active_agg_info failed\n",

			 dev->name);

		goto out;

	}
@@ -2391,8 +2409,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev) 


	if (slaves_in_agg == 0) {

		/*the aggregator is empty*/

		pr_debug(DRV_NAME ": %s: Error: active aggregator is empty\n",

			 dev->name);

		pr_debug("%s: Error: active aggregator is empty\n", dev->name);

		goto out;

	}
@@ -2410,8 +2427,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev) 
	}



	if (slave_agg_no >= 0) {

		pr_err(DRV_NAME ": %s: Error: Couldn't find a slave to tx on "

		       "for aggregator ID %d\n", dev->name, agg_id);

		pr_err("%s: Error: Couldn't find a slave to tx on for aggregator ID %d\n",

		       dev->name, agg_id);

		goto out;

	}