linux-toradex.git/drivers/net/bonding/bond_3ad.h, branch v3.0.5

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-05-17T21:33:11+00:00

Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c

bonding,llc: Fix structure sizeof incompatibility for some PDUs

2011-05-13T19:13:24+00:00

With some combinations of arch/compiler (e.g. arm-linux-gcc) the sizeof
operator on structure returns value greater than expected. In cases when the
structure is used for mapping PDU fields it may lead to unexpected results
(such as holes and alignment problems in skb data). __packed prevents this
undesired behavior.

Signed-off-by: Vitalii Demianets 
Signed-off-by: David S. Miller

bonding: move processing of recv handlers into handle_frame()

2011-04-25T19:00:30+00:00

Since now when bonding uses rx_handler, all traffic going into bond
device goes thru bond_handle_frame. So there's no need to go back into
bonding code later via ptype handlers. This patch converts
original ptype handlers into "bonding receive probes". These functions
are called from bond_handle_frame and they are registered per-mode.

Note that vlan packets are also handled because they are always untagged
thanks to vlan_untag()

Note that this also allows arpmon for eth-bond-bridge-vlan topology.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

bonding 802.3ad: Rename rx_machine_lock to state_machine_lock

2011-03-08T00:02:18+00:00

Rename the rx_machine_lock to state_machine_lock as this makes more
sense in light of it now protecting all the state machines against
concurrency.

Signed-off-by: Nils Carlson 
Signed-off-by: David S. Miller

Remove duplicate slow protocol define in bond_3ad.h

2009-05-09T20:15:49+00:00

ETH_P_SLOW is already defined in include/linux/if_ether.h.
There's no need to define BOND_ETH_P_LACPDU in drivers/net/bonding/bond_3ad.h

Signed-off-by: Richard Genoud 
Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

net: replace uses of __constant_{endian}

2009-02-01T08:45:17+00:00

Base versions handle constant folding now.

Signed-off-by: Harvey Harrison 
Signed-off-by: David S. Miller

802.3ad: use standard ethhdr instead of ad_header

2008-12-26T21:41:53+00:00

802.3ad has its own ethhdr-like structure in the form of an ad_header,
which is at the start of both the LACPDU and marker PDU.  Both are
the same from the struct values, both are packed as well.

It's therefore perfectly fine to replace the ad_header by the ethhdr
and to remove its definition.

Signed-off-by: Holger Eitzenberger 
Signed-off-by: David S. Miller

802.3ad: generalize out mac address initializer

2008-12-26T21:40:48+00:00

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 
Signed-off-by: David S. Miller

802.3ad: remove typedef around ad_system

2008-12-26T21:27:57+00:00

As typedefs are considered a bad thing most of the time remove the
typedef around ad_system.

Signed-off-by: Holger Eitzenberger 
Signed-off-by: David S. Miller

802.3ad: turn ports is_individual into a bool

2008-12-26T21:27:21+00:00

Turn ports is_individual into a bool.  There is no functional change.

Signed-off-by: Holger Eitzenberger 
Signed-off-by: David S. Miller