From: David S. Miller <davem@davemloft.net>
Date: Sat, 14 Jun 2008 03:52:39 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~969^2~326
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4ae127d1b6c71f9240dd4245f240e6dd8fc98014;p=linux-2.6-omap-h63xx.git

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

Conflicts:

	drivers/net/smc911x.c
---

4ae127d1b6c71f9240dd4245f240e6dd8fc98014
diff --cc drivers/net/bnx2.c
index b32d22762b9,367b6d46270..2c52d2c7c49
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@@ -5664,10 -5724,9 +5664,9 @@@ bnx2_reset_task(struct work_struct *wor
  	if (!netif_running(bp->dev))
  		return;
  
- 	bp->in_reset_task = 1;
  	bnx2_netif_stop(bp);
  
 -	bnx2_init_nic(bp);
 +	bnx2_init_nic(bp, 1);
  
  	atomic_set(&bp->intr_sem, 1);
  	bnx2_netif_start(bp);
diff --cc drivers/net/smc911x.h
index 7cc7cd7e99c,7defa63b9c7..76c17c28fab
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@@ -42,66 -41,9 +42,65 @@@
    #define SMC_USE_16BIT		0
    #define SMC_USE_32BIT		1
    #define SMC_IRQ_SENSE		IRQF_TRIGGER_LOW
 +#else
 +/*
 + * Default configuration
 + */
 +
 +#define SMC_DYNAMIC_BUS_CONFIG
  #endif
  
 +/* store this information for the driver.. */
 +struct smc911x_local {
 +	/*
 +	 * If I have to wait until the DMA is finished and ready to reload a
 +	 * packet, I will store the skbuff here. Then, the DMA will send it
 +	 * out and free it.
 +	 */
 +	struct sk_buff *pending_tx_skb;
 +
 +	/* version/revision of the SMC911x chip */
 +	u16 version;
 +	u16 revision;
 +
 +	/* FIFO sizes */
 +	int tx_fifo_kb;
 +	int tx_fifo_size;
 +	int rx_fifo_size;
 +	int afc_cfg;
 +
 +	/* Contains the current active receive/phy mode */
 +	int ctl_rfduplx;
 +	int ctl_rspeed;
 +
 +	u32 msg_enable;
 +	u32 phy_type;
 +	struct mii_if_info mii;
 +
 +	/* work queue */
 +	struct work_struct phy_configure;
- 	int work_pending;
 +
 +	int tx_throttle;
 +	spinlock_t lock;
 +
 +	struct net_device *netdev;
 +
 +#ifdef SMC_USE_DMA
 +	/* DMA needs the physical address of the chip */
 +	u_long physaddr;
 +	int rxdma;
 +	int txdma;
 +	int rxdma_active;
 +	int txdma_active;
 +	struct sk_buff *current_rx_skb;
 +	struct sk_buff *current_tx_skb;
 +	struct device *dev;
 +#endif
 +	void __iomem *base;
 +#ifdef SMC_DYNAMIC_BUS_CONFIG
 +	struct smc911x_platdata cfg;
 +#endif
 +};
  
  /*
   * Define the bus width specific IO macros
diff --cc include/linux/tcp.h
index 9881295f385,b31b6b74aa2..07e79bdb9cd
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@@ -371,18 -361,23 +366,16 @@@ struct tcp_sock 
  				 * the first SYN. */
  	u32	undo_marker;	/* tracking retrans started here. */
  	int	undo_retrans;	/* number of undoable retransmissions. */
 +	u32	total_retrans;	/* Total retransmits for entire connection */
 +
  	u32	urg_seq;	/* Seq of received urgent pointer */
 -	u16	urg_data;	/* Saved octet of OOB data and control flags */
 -	u8	urg_mode;	/* In urgent mode		*/
 -	u8	ecn_flags;	/* ECN status bits.			*/
  	u32	snd_up;		/* Urgent pointer		*/
  
 -	u32	total_retrans;	/* Total retransmits for entire connection */
 -	u32	bytes_acked;	/* Appropriate Byte Counting - RFC3465 */
 -
  	unsigned int		keepalive_time;	  /* time before keep alive takes place */
  	unsigned int		keepalive_intvl;  /* time interval between keep alive probes */
 -	int			linger2;
  
- 	struct tcp_deferred_accept_info defer_tcp_accept;
- 
  	unsigned long last_synq_overflow; 
  
 -	u32	tso_deferred;
 -
  /* Receiver side RTT estimation */
  	struct {
  		u32	rtt;