Commit a5779365 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (51 commits)
  [IPV6]: Fix again the fl6_sock_lookup() fixed locking
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening fix
  [IPV6]: Fix race in ipv6_flowlabel_opt() when inserting two labels
  [IPV6]: Lost locking in fl6_sock_lookup
  [IPV6]: Lost locking when inserting a flowlabel in ipv6_fl_list
  [NETFILTER]: xt_sctp: fix mistake to pass a pointer where array is required
  [NET]: Fix OOPS due to missing check in dev_parse_header().
  [TCP]: Remove lost_retrans zero seqno special cases
  [NET]: fix carrier-on bug?
  [NET]: Fix uninitialised variable in ip_frag_reasm()
  [IPSEC]: Rename mode to outer_mode and add inner_mode
  [IPSEC]: Disallow combinations of RO and AH/ESP/IPCOMP
  [IPSEC]: Use the top IPv4 route's peer instead of the bottom
  [IPSEC]: Store afinfo pointer in xfrm_mode
  [IPSEC]: Add missing BEET checks
  [IPSEC]: Move type and mode map into xfrm_state.c
  [IPSEC]: Fix length check in xfrm_parse_spi
  [IPSEC]: Move ip_summed zapping out of xfrm6_rcv_spi
  [IPSEC]: Get nexthdr from caller in xfrm6_rcv_spi
  [IPSEC]: Move tunnel parsing for IPv4 out of xfrm4_input
  ...
parents 9cf52b29 52f095ee

arch/um/drivers/slip_kern.c

+1 −3
Original line number Diff line number Diff line
@@ -31,10 +31,8 @@ void slip_init(struct net_device *dev, void *data) 
	slip_proto_init(&spri->slip);



	dev->init = NULL;

	dev->header_cache_update = NULL;

	dev->hard_header_cache = NULL;

	dev->hard_header = NULL;

	dev->hard_header_len = 0;

	dev->header_ops = NULL;

	dev->addr_len = 0;

	dev->type = ARPHRD_SLIP;

	dev->tx_queue_len = 256;

arch/um/drivers/slirp_kern.c

+1 −3
Original line number Diff line number Diff line
@@ -34,9 +34,7 @@ void slirp_init(struct net_device *dev, void *data) 


	dev->init = NULL;

	dev->hard_header_len = 0;

	dev->header_cache_update = NULL;

	dev->hard_header_cache = NULL;

	dev->hard_header = NULL;

	dev->header_ops = NULL;

	dev->addr_len = 0;

	dev->type = ARPHRD_SLIP;

	dev->tx_queue_len = 256;

drivers/net/bnx2.c

+21 −11
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ 


#define DRV_MODULE_NAME		"bnx2"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"1.6.7"

#define DRV_MODULE_RELDATE	"October 10, 2007"

#define DRV_MODULE_VERSION	"1.6.8"

#define DRV_MODULE_RELDATE	"October 17, 2007"



#define RUN_AT(x) (jiffies + (x))
@@ -3079,14 +3079,18 @@ bnx2_set_power_state(struct bnx2 *bp, pci_power_t state) 
			autoneg = bp->autoneg;

			advertising = bp->advertising;



			if (bp->phy_port == PORT_TP) {

				bp->autoneg = AUTONEG_SPEED;

				bp->advertising = ADVERTISED_10baseT_Half |

					ADVERTISED_10baseT_Full |

					ADVERTISED_100baseT_Half |

					ADVERTISED_100baseT_Full |

					ADVERTISED_Autoneg;

			}



			bnx2_setup_copper_phy(bp);

			spin_lock_bh(&bp->phy_lock);

			bnx2_setup_phy(bp, bp->phy_port);

			spin_unlock_bh(&bp->phy_lock);



			bp->autoneg = autoneg;

			bp->advertising = advertising;
@@ -3097,10 +3101,16 @@ bnx2_set_power_state(struct bnx2 *bp, pci_power_t state) 


			/* Enable port mode. */

			val &= ~BNX2_EMAC_MODE_PORT;

			val |= BNX2_EMAC_MODE_PORT_MII |

			       BNX2_EMAC_MODE_MPKT_RCVD |

			val |= BNX2_EMAC_MODE_MPKT_RCVD |

			       BNX2_EMAC_MODE_ACPI_RCVD |

			       BNX2_EMAC_MODE_MPKT;

			if (bp->phy_port == PORT_TP)

				val |= BNX2_EMAC_MODE_PORT_MII;

			else {

				val |= BNX2_EMAC_MODE_PORT_GMII;

				if (bp->line_speed == SPEED_2500)

					val |= BNX2_EMAC_MODE_25G_MODE;

			}



			REG_WR(bp, BNX2_EMAC_MODE, val);

drivers/net/bnx2_fw2.h

+3929 −3904

File changed.

Preview size limit exceeded, changes collapsed.

drivers/ssb/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ config SSB 


config SSB_PCIHOST_POSSIBLE

	bool

	depends on SSB && PCI

	depends on SSB && (PCI = y || PCI = SSB)

	default y



config SSB_PCIHOST
@@ -37,7 +37,7 @@ config SSB_PCIHOST 


config SSB_PCMCIAHOST_POSSIBLE

	bool

	depends on SSB && PCMCIA && EXPERIMENTAL

	depends on SSB && (PCMCIA = y || PCMCIA = SSB) && EXPERIMENTAL

	default y



config SSB_PCMCIAHOST

CRA Git | Maintained and supported by SUSTech CRA and CCSE