Commit aa62a869 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:
  [IRDA]: irda parameters warning fixes.
  [IRDA]: stir4200 fixes.
  [IRDA]: irlmp_unregister_link() needs to free lsaps.
  [IRDA]: mcs7780 needs to free allocated rx buffer.
  [IRDA]: Race between open and disconnect in irda-usb.
  [SCTP]: Flush fragment queue when exiting partial delivery.
  [AX25]: Locking dependencies fix in ax25_disconnect().
  [IPV4]: Make tcp_input_metrics() get minimum RTO via tcp_rto_min()
  [IPV6]: Fix the return value of ipv6_getsockopt
  [BRIDGE]: Assign random address.
  [IPV4]: Updates to nfsroot documentation
  [ATM]: Fix compiler warning noise with FORE200E driver
  [NETFILTER]: bridge: fix missing link layer headers on outgoing routed packets
  [SYNCPPP]: Endianness and 64bit fixes.
  [TIPC]: Fix semaphore handling.
  [NETFILTER]: xt_hashlimit should use time_after_eq()
  [XFRM]: Display the audited SPI value in host byte order.
  [NETFILTER]: ip_tables: fix compat copy race
  [NETFILTER]: ctnetlink: set expected bit for related conntracks
parents de29cba9 a26e01d7

Documentation/nfsroot.txt

+9 −3
Original line number Diff line number Diff line
@@ -92,8 +92,14 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> 
  autoconfiguration.



  The <autoconf> parameter can appear alone as the value to the `ip'

  parameter (without all the ':' characters before) in which case auto-

  configuration is used.

  parameter (without all the ':' characters before).  If the value is

  "ip=off" or "ip=none", no autoconfiguration will take place, otherwise

  autoconfiguration will take place.  The most common way to use this

  is "ip=dhcp".



  Note that "ip=off" is not the same thing as "ip=::::::off", because in

  the latter autoconfiguration will take place if any of DHCP, BOOTP or RARP

  are compiled in the kernel.



  <client-ip>	IP address of the client.
@@ -142,7 +148,7 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> 
		into the kernel will be used, regardless of the value of

		this option.



                  off or none: don't use autoconfiguration (default)

                  off or none: don't use autoconfiguration

		  on or any:   use any protocol available in the kernel

		  dhcp:        use DHCP

		  bootp:       use BOOTP

drivers/atm/fore200e.c

+1 −2
Original line number Diff line number Diff line
@@ -2689,7 +2689,7 @@ fore200e_init(struct fore200e* fore200e) 
    return 0;

}





#ifdef CONFIG_ATM_FORE200E_PCA

static int __devinit

fore200e_pca_detect(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)

{
@@ -2756,7 +2756,6 @@ static void __devexit fore200e_pca_remove_one(struct pci_dev *pci_dev) 
}





#ifdef CONFIG_ATM_FORE200E_PCA

static struct pci_device_id fore200e_pca_tbl[] = {

    { PCI_VENDOR_ID_FORE, PCI_DEVICE_ID_FORE_PCA200E, PCI_ANY_ID, PCI_ANY_ID,

      0, 0, (unsigned long) &fore200e_bus[0] },

drivers/net/irda/irda-usb.c

+5 −0
Original line number Diff line number Diff line
@@ -1168,6 +1168,7 @@ static int stir421x_patch_device(struct irda_usb_cb *self) 
static int irda_usb_net_open(struct net_device *netdev)

{

	struct irda_usb_cb *self;

	unsigned long flags;

	char	hwname[16];

	int i;
@@ -1177,13 +1178,16 @@ static int irda_usb_net_open(struct net_device *netdev) 
	self = (struct irda_usb_cb *) netdev->priv;

	IRDA_ASSERT(self != NULL, return -1;);



	spin_lock_irqsave(&self->lock, flags);

	/* Can only open the device if it's there */

	if(!self->present) {

		spin_unlock_irqrestore(&self->lock, flags);

		IRDA_WARNING("%s(), device not present!\n", __FUNCTION__);

		return -1;

	}



	if(self->needspatch) {

		spin_unlock_irqrestore(&self->lock, flags);

		IRDA_WARNING("%s(), device needs patch\n", __FUNCTION__) ;

		return -EIO ;

	}
@@ -1198,6 +1202,7 @@ static int irda_usb_net_open(struct net_device *netdev) 
	/* To do *before* submitting Rx urbs and starting net Tx queue

	 * Jean II */

	self->netopen = 1;

	spin_unlock_irqrestore(&self->lock, flags);



	/* 

	 * Now that everything should be initialized properly,

drivers/net/irda/mcs7780.c

+2 −0
Original line number Diff line number Diff line
@@ -677,6 +677,8 @@ static int mcs_net_close(struct net_device *netdev) 
	/* Stop transmit processing */

	netif_stop_queue(netdev);



	kfree_skb(mcs->rx_buff.skb);



	/* kill and free the receive and transmit URBs */

	usb_kill_urb(mcs->rx_urb);

	usb_free_urb(mcs->rx_urb);

drivers/net/irda/stir4200.c

+6 −4
Original line number Diff line number Diff line
@@ -142,9 +142,6 @@ enum StirCtrl2Mask { 
};



enum StirFifoCtlMask {

	FIFOCTL_EOF = 0x80,

	FIFOCTL_UNDER = 0x40,

	FIFOCTL_OVER = 0x20,

	FIFOCTL_DIR = 0x10,

	FIFOCTL_CLR = 0x08,

	FIFOCTL_EMPTY = 0x04,
@@ -594,9 +591,10 @@ static int fifo_txwait(struct stir_cb *stir, int space) 
{

	int err;

	unsigned long count, status;

	unsigned long prev_count = 0x1fff;



	/* Read FIFO status and count */

	for(;;) {

	for (;; prev_count = count) {

		err = read_reg(stir, REG_FIFOCTL, stir->fifo_status, 

				   FIFO_REGS_SIZE);

		if (unlikely(err != FIFO_REGS_SIZE)) {
@@ -629,6 +627,10 @@ static int fifo_txwait(struct stir_cb *stir, int space) 
		if (space >= 0 && STIR_FIFO_SIZE - 4 > space + count)

			return 0;



		/* queue confused */

		if (prev_count < count)

			break;



		/* estimate transfer time for remaining chars */

		msleep((count * 8000) / stir->speed);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE