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

Commit 298eaaad 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:
  bridge: fix forwarding of IPv6
  bonding,llc: Fix structure sizeof incompatibility for some PDUs
  ipv6: restore correct ECN handling on TCP xmit
  ne-h8300: Fix regression caused during net_device_ops conversion
  hydra: Fix regression caused during net_device_ops conversion
  zorro8390: Fix regression caused during net_device_ops conversion
  sfc: Always map MCDI shared memory as uncacheable
  ehea: Fix memory hotplug oops
  libertas: fix cmdpendingq locking
  iwlegacy: fix IBSS mode crashes
  ath9k: Fix a warning due to a queued work during S3 state
  mac80211: don't start the dynamic ps timer if not associated
parents cf70cc5b cb685528

drivers/net/Makefile

+3 −3
Original line number Original line Diff line number Diff line
@@ -144,7 +144,7 @@ obj-$(CONFIG_NE3210) += ne3210.o 8390.o 
obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o

obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o

obj-$(CONFIG_B44) += b44.o

obj-$(CONFIG_B44) += b44.o

obj-$(CONFIG_FORCEDETH) += forcedeth.o

obj-$(CONFIG_FORCEDETH) += forcedeth.o

obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o

obj-$(CONFIG_NE_H8300) += ne-h8300.o

obj-$(CONFIG_AX88796) += ax88796.o

obj-$(CONFIG_AX88796) += ax88796.o

obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o

obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o

obj-$(CONFIG_FTMAC100) += ftmac100.o

obj-$(CONFIG_FTMAC100) += ftmac100.o
@@ -219,7 +219,7 @@ obj-$(CONFIG_SC92031) += sc92031.o 
obj-$(CONFIG_LP486E) += lp486e.o

obj-$(CONFIG_LP486E) += lp486e.o





obj-$(CONFIG_ETH16I) += eth16i.o

obj-$(CONFIG_ETH16I) += eth16i.o

obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o

obj-$(CONFIG_ZORRO8390) += zorro8390.o

obj-$(CONFIG_HPLANCE) += hplance.o 7990.o

obj-$(CONFIG_HPLANCE) += hplance.o 7990.o

obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o

obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o

obj-$(CONFIG_EQUALIZER) += eql.o

obj-$(CONFIG_EQUALIZER) += eql.o
@@ -231,7 +231,7 @@ obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o 
obj-$(CONFIG_DECLANCE) += declance.o

obj-$(CONFIG_DECLANCE) += declance.o

obj-$(CONFIG_ATARILANCE) += atarilance.o

obj-$(CONFIG_ATARILANCE) += atarilance.o

obj-$(CONFIG_A2065) += a2065.o

obj-$(CONFIG_A2065) += a2065.o

obj-$(CONFIG_HYDRA) += hydra.o 8390.o

obj-$(CONFIG_HYDRA) += hydra.o

obj-$(CONFIG_ARIADNE) += ariadne.o

obj-$(CONFIG_ARIADNE) += ariadne.o

obj-$(CONFIG_CS89x0) += cs89x0.o

obj-$(CONFIG_CS89x0) += cs89x0.o

obj-$(CONFIG_MACSONIC) += macsonic.o

obj-$(CONFIG_MACSONIC) += macsonic.o

drivers/net/bonding/bond_3ad.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ 




typedef struct mac_addr {

typedef struct mac_addr {

	u8 mac_addr_value[ETH_ALEN];

	u8 mac_addr_value[ETH_ALEN];

} mac_addr_t;

} __packed mac_addr_t;





enum {

enum {

	BOND_AD_STABLE = 0,

	BOND_AD_STABLE = 0,
@@ -134,12 +134,12 @@ typedef struct lacpdu { 
	u8 tlv_type_terminator;	     // = terminator

	u8 tlv_type_terminator;	     // = terminator

	u8 terminator_length;	     // = 0

	u8 terminator_length;	     // = 0

	u8 reserved_50[50];	     // = 0

	u8 reserved_50[50];	     // = 0

} lacpdu_t;

} __packed lacpdu_t;





typedef struct lacpdu_header {

typedef struct lacpdu_header {

	struct ethhdr hdr;

	struct ethhdr hdr;

	struct lacpdu lacpdu;

	struct lacpdu lacpdu;

} lacpdu_header_t;

} __packed lacpdu_header_t;





// Marker Protocol Data Unit(PDU) structure(43.5.3.2 in the 802.3ad standard)

// Marker Protocol Data Unit(PDU) structure(43.5.3.2 in the 802.3ad standard)

typedef struct bond_marker {

typedef struct bond_marker {
@@ -155,12 +155,12 @@ typedef struct bond_marker { 
	u8 tlv_type_terminator;	     //  = 0x00

	u8 tlv_type_terminator;	     //  = 0x00

	u8 terminator_length;	     //  = 0x00

	u8 terminator_length;	     //  = 0x00

	u8 reserved_90[90];	     //  = 0

	u8 reserved_90[90];	     //  = 0

} bond_marker_t;

} __packed bond_marker_t;





typedef struct bond_marker_header {

typedef struct bond_marker_header {

	struct ethhdr hdr;

	struct ethhdr hdr;

	struct bond_marker marker;

	struct bond_marker marker;

} bond_marker_header_t;

} __packed bond_marker_header_t;





#pragma pack()

#pragma pack()

drivers/net/ehea/ehea_main.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -2688,9 +2688,6 @@ static int ehea_open(struct net_device *dev) 
		netif_start_queue(dev);

		netif_start_queue(dev);

	}

	}





	init_waitqueue_head(&port->swqe_avail_wq);

	init_waitqueue_head(&port->restart_wq);



	mutex_unlock(&port->port_lock);

	mutex_unlock(&port->port_lock);





	return ret;

	return ret;
@@ -3276,6 +3273,9 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, 




	INIT_WORK(&port->reset_task, ehea_reset_port);

	INIT_WORK(&port->reset_task, ehea_reset_port);





	init_waitqueue_head(&port->swqe_avail_wq);

	init_waitqueue_head(&port->restart_wq);



	ret = register_netdev(dev);

	ret = register_netdev(dev);

	if (ret) {

	if (ret) {

		pr_err("register_netdev failed. ret=%d\n", ret);

		pr_err("register_netdev failed. ret=%d\n", ret);

drivers/net/hydra.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -98,15 +98,15 @@ static const struct net_device_ops hydra_netdev_ops = { 
	.ndo_open		= hydra_open,

	.ndo_open		= hydra_open,

	.ndo_stop		= hydra_close,

	.ndo_stop		= hydra_close,





	.ndo_start_xmit		= ei_start_xmit,

	.ndo_start_xmit		= __ei_start_xmit,

	.ndo_tx_timeout		= ei_tx_timeout,

	.ndo_tx_timeout		= __ei_tx_timeout,

	.ndo_get_stats		= ei_get_stats,

	.ndo_get_stats		= __ei_get_stats,

	.ndo_set_multicast_list = ei_set_multicast_list,

	.ndo_set_multicast_list = __ei_set_multicast_list,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= eth_mac_addr,

	.ndo_set_mac_address	= eth_mac_addr,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_change_mtu		= eth_change_mtu,

#ifdef CONFIG_NET_POLL_CONTROLLER

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= ei_poll,

	.ndo_poll_controller	= __ei_poll,

#endif

#endif

};

};
@@ -125,7 +125,7 @@ static int __devinit hydra_init(struct zorro_dev *z) 
	0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,

	0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,

    };

    };





    dev = alloc_ei_netdev();

    dev = ____alloc_ei_netdev(0);

    if (!dev)

    if (!dev)

	return -ENOMEM;

	return -ENOMEM;

drivers/net/ne-h8300.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -167,7 +167,7 @@ static void cleanup_card(struct net_device *dev) 
#ifndef MODULE

#ifndef MODULE

struct net_device * __init ne_probe(int unit)

struct net_device * __init ne_probe(int unit)

{

{

	struct net_device *dev = alloc_ei_netdev();

	struct net_device *dev = ____alloc_ei_netdev(0);

	int err;

	int err;





	if (!dev)

	if (!dev)
@@ -197,15 +197,15 @@ static const struct net_device_ops ne_netdev_ops = { 
	.ndo_open		= ne_open,

	.ndo_open		= ne_open,

	.ndo_stop		= ne_close,

	.ndo_stop		= ne_close,





	.ndo_start_xmit		= ei_start_xmit,

	.ndo_start_xmit		= __ei_start_xmit,

	.ndo_tx_timeout		= ei_tx_timeout,

	.ndo_tx_timeout		= __ei_tx_timeout,

	.ndo_get_stats		= ei_get_stats,

	.ndo_get_stats		= __ei_get_stats,

	.ndo_set_multicast_list = ei_set_multicast_list,

	.ndo_set_multicast_list = __ei_set_multicast_list,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= eth_mac_addr,

	.ndo_set_mac_address	= eth_mac_addr,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_change_mtu		= eth_change_mtu,

#ifdef CONFIG_NET_POLL_CONTROLLER

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= ei_poll,

	.ndo_poll_controller	= __ei_poll,

#endif

#endif

};

};
@@ -637,7 +637,7 @@ int init_module(void) 
	int err;

	int err;





	for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {

	for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {

		struct net_device *dev = alloc_ei_netdev();

		struct net_device *dev = ____alloc_ei_netdev(0);

		if (!dev)

		if (!dev)

			break;

			break;

		if (io[this_dev]) {

		if (io[this_dev]) {